From 884d562a63b3ab5f022ba0804edc398da463b494 Mon Sep 17 00:00:00 2001 From: Misa Date: Thu, 6 May 2021 11:58:38 -0700 Subject: [PATCH] Allow using Esc in Super Gravitron quit menu This is a small quality-of-life fix in the same vein as allowing the player to press Esc in the teleporter menu (which they weren't able to do in 2.2, either). --- desktop_version/src/Input.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 432f3c2b..54c9965d 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -2215,13 +2215,16 @@ void mapinput(void) { game.press_action = true; } - if (game.menupage < 12 || (game.menupage >= 30 && game.menupage <= 32)) + if (game.menupage < 12 + || (game.menupage >= 20 && game.menupage <= 21) + || (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) { game.mapheld = true; - if (game.menupage < 9) + if (game.menupage < 9 + || (game.menupage >= 20 && game.menupage <= 21)) { game.menupage = 30; }