From d89ce76577c3cd7aecd2607da19113f9b0ec37fe Mon Sep 17 00:00:00 2001 From: Misa Date: Sun, 11 Apr 2021 13:45:42 -0700 Subject: [PATCH] Fix returning from confirm quit menu putting cursor on options The in-game menu code is better than it was in 2.2 but still pretty hardcoded, so to fix this just change each individual case around. This bug happened because the "options" button was in the place where "quit to menu" was previously, but Terry forgot to update it when changing all the options around. --- desktop_version/src/Input.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index d6f2ae0a..c86aeac5 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -2147,7 +2147,7 @@ void mapinput(void) { game.press_action = true; } - if (game.menupage < 12 || (game.menupage >= 30 && game.menupage <= 33)) + if (game.menupage < 12 || (game.menupage >= 30 && game.menupage <= 32)) { if (key.isDown(KEYBOARD_ENTER) || key.isDown(game.controllerButton_map) ) game.press_map = true; if (key.isDown(27) && !game.mapheld) @@ -2159,7 +2159,7 @@ void mapinput(void) } else if (game.menupage < 12) { - game.menupage = 31; + game.menupage = 32; } else { @@ -2297,7 +2297,7 @@ static void mapmenuactionpress(void) case 10: //return to pause menu music.playef(11); - game.menupage = 31; + game.menupage = 32; break; case 11: //quit to menu