mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed message

This commit is contained in:
Zeno Rogue 2018-04-15 13:19:03 +02:00
parent f124fb590d
commit d3250c13c8
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
system.cpp
View File

@ -25,6 +25,12 @@ bool verless(string v, string cmp) {
return v < cmp; return v < cmp;
} }
bool do_use_special_land() {
return
!safety &&
(peace::on || tactic::on || geometry || gp::on || randomPatternsMode || yendor::on);
}
void welcomeMessage() { void welcomeMessage() {
if(tactic::trailer) return; if(tactic::trailer) return;
#if CAP_TOUR #if CAP_TOUR
@ -62,9 +68,11 @@ void welcomeMessage() {
addMessage(XLAT("Welcome to HyperRogue!")); addMessage(XLAT("Welcome to HyperRogue!"));
} }
auto lv = land_validity(specialland); if(do_use_special_land() || firstland != laIce) {
if(lv.flags & lv::display_error_message) auto lv = land_validity(specialland);
addMessage(XLAT(lv.msg)); if(lv.flags & lv::display_error_message)
addMessage(XLAT(lv.msg));
}
#if ISMAC #if ISMAC
addMessage(XLAT("Press F1 or right-shift-click things for help.")); addMessage(XLAT("Press F1 or right-shift-click things for help."));
@ -88,9 +96,7 @@ void initgame() {
firstland = safetyland; firstland = safetyland;
} }
bool use_special_land = bool use_special_land = do_use_special_land();
!safety &&
(peace::on || tactic::on || geometry || gp::on || randomPatternsMode || yendor::on);
if(use_special_land) firstland = specialland; if(use_special_land) firstland = specialland;