mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-07-07 11:52:51 +00:00
Fix minor menu glitches.
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:
parent
7581ba887b
commit
601274e67a
@ -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;
|
||||||
|
|
||||||
|
2
quit.cpp
2
quit.cpp
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user