From 06102e2db3629486e08ada7ef1f20587c8b69a53 Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 22 Jun 2020 15:47:25 -0700 Subject: [PATCH] Make better Esc menu functional So now the options do what they do. However, I still need to fix the 1-frame glitch when switching to TITLEMODE, as well as make returning from the menu return back to MAPMODE, as well as making this better menu integrate seamlessly with the existing menus. --- desktop_version/src/Input.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index ca9f6d89..b7a44fce 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -2079,6 +2079,29 @@ void mapmenuactionpress() game.fadetolab = true; game.fadetolabdelay = 16; break; + case 30: + // Return to game + graphics.resumegamemode = true; + break; + case 31: + // Go to quit prompt + music.playef(11); + game.menupage = 10; + break; + case 32: + // Graphic options + music.playef(11); + game.gamestate = TITLEMODE; + game.createmenu(Menu::graphicoptions); + map.nexttowercolour(); + break; + case 33: + // Game options + music.playef(11); + game.gamestate = TITLEMODE; + game.createmenu(Menu::options); + map.nexttowercolour(); + break; } }