mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-20 03:54:47 +00:00
Code Issues Releases Wiki Activity

Fix minor menu glitches.

Browse Source 
Currently, if CAP_TOUR is not set then "(v) menu" is displayed
unconditionally, because the "else" statement which suppresses its
display when nomenukey is set is guarded by CAP_TOUR.  That "else"
statement is moved outside the guard.

Currently, the "timeline" -- containing the elapsed time, turn count,
and YASC code -- is not displayed if cheats are active, because it's
replaced by a cheats count line.  Since these lines don't conflict
and the timeline contains useful information, changed to display both.
This commit is contained in:
Jacob Mandelson 2024-05-16 07:12:28 -07:00
parent 7581ba887b
commit 601274e67a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graph.cpp
View File

@ -5803,8 +5803,8 @@ EX void normalscreen() {
#if CAP_TOUR #if CAP_TOUR
else if(tour::on) else if(tour::on)
displayButton(vid.xres-8, vid.yres-vid.fsize, XLAT("(ESC) tour menu"), SDLK_ESCAPE, 16); displayButton(vid.xres-8, vid.yres-vid.fsize, XLAT("(ESC) tour menu"), SDLK_ESCAPE, 16);
else
#endif #endif
else
displayButton(vid.xres-8, vid.yres-vid.fsize, XLAT("(v) menu"), 'v', 16); displayButton(vid.xres-8, vid.yres-vid.fsize, XLAT("(v) menu"), 'v', 16);
keyhandler = handleKeyNormal; keyhandler = handleKeyNormal;

6
quit.cpp
View File

@ -50,7 +50,7 @@ string timeline() {
else { else {
s = XLAT("%1 turns (%2)", its(turncount), getgametime_s()); s = XLAT("%1 turns (%2)", its(turncount), getgametime_s());
if(display_yasc_codes) if(display_yasc_codes)
s+= XLAT(" YASC code: ") + formatted_yasc_code(); s += XLAT(" YASC code: ") + formatted_yasc_code();
} }
return s; return s;
} }
@ -332,7 +332,7 @@ EX void showGameMenu() {
#if CAP_TOUR #if CAP_TOUR
tour::on ? (canmove ? XLAT("guided tour") : XLAT("GAME OVER")) : tour::on ? (canmove ? XLAT("guided tour") : XLAT("GAME OVER")) :
#endif #endif
(cheater && !autocheat)? XLAT("It is a shame to cheat!") : (cheater && !autocheat) ? XLAT("It is a shame to cheat!") :
racing::on ? "racing mode" : racing::on ? "racing mode" :
(canmove && princess::challenge) ? XLAT("%1 Challenge", moPrincess) : (canmove && princess::challenge) ? XLAT("%1 Challenge", moPrincess) :
canmove ? XLAT("Quest status") : canmove ? XLAT("Quest status") :
@ -445,7 +445,7 @@ EX void showGameMenu() {
if(cheater && !autocheat) { if(cheater && !autocheat) {
dialog::addInfo(XLAT("you have cheated %1 times", its(cheater)), 0xFF2020); dialog::addInfo(XLAT("you have cheated %1 times", its(cheater)), 0xFF2020);
} }
else if(!racing::on) { if(!racing::on) {
dialog::addInfo(timeline(), dialog::dialogcolor); dialog::addInfo(timeline(), dialog::dialogcolor);
} }