From d4336b9a33f6a19991fb1836634b9668a7885688 Mon Sep 17 00:00:00 2001 From: Misa Date: Sun, 6 Sep 2020 04:49:53 -0700 Subject: [PATCH] Hoist Enter check out of script.running clause This fixes the fact that an Enter release during a "- Press ACTION to advacne text -" prompt wouldn't be properly registered. --- desktop_version/src/Input.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index efc7704b..7cbce5ca 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -1715,7 +1715,6 @@ void gameinput() game.press_left = false; game.press_right = false; game.press_action = false; - game.press_map = false; if (key.isDown(KEYBOARD_LEFT) || key.isDown(KEYBOARD_a) || key.controllerWantsLeft(false)) { @@ -1730,10 +1729,12 @@ void gameinput() { game.press_action = true; }; - if (key.isDown(KEYBOARD_ENTER) || key.isDown(SDLK_KP_ENTER) || key.isDown(game.controllerButton_map) ) - { - game.press_map = true; - } + } + + game.press_map = false; + if (key.isDown(KEYBOARD_ENTER) || key.isDown(SDLK_KP_ENTER) || key.isDown(game.controllerButton_map) ) + { + game.press_map = true; } if (game.advancetext)