From a476121432ea2104e54205613b6ad33c90ac5248 Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 22 Jun 2020 17:29:30 -0700 Subject: [PATCH] Make pressing Esc in ingame_titlemode go back to pause menu You shouldn't be able to bring up the youwannaquit menu while you're in-game, that should only be when you're actually not in game. --- desktop_version/src/Input.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 57427086..abea325a 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -1468,8 +1468,15 @@ void titleinput() if (key.isDown(27) && game.currentmenuname != Menu::youwannaquit && game.menustart) { music.playef(11); - game.createmenu(Menu::youwannaquit); - map.nexttowercolour(); + if (game.ingame_titlemode) + { + game.returntopausemenu(); + } + else + { + game.createmenu(Menu::youwannaquit); + map.nexttowercolour(); + } } if(game.menustart)