From 3235b64d193040695f49cf0d943a8becdb83dba5 Mon Sep 17 00:00:00 2001 From: Misa Date: Thu, 7 May 2020 15:47:12 -0700 Subject: [PATCH] Remove reliance on fademode to return to menu This was used by the old system, which also had an over-reliance on Terry's State Machine. And due to the fact that it relied on fademode, it also meant that bringing up the pause screen while faded-out would result in the player getting sent back to the menu, so one accidental Esc press during a cutscene could mean countless hours of progress lost (especially in custom levels). --- desktop_version/src/Input.cpp | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index 6ada6286..e9fe2b3c 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -1900,24 +1900,6 @@ void mapinput() } } - if (graphics.fademode == 1) - { - FillRect(graphics.menubuffer, 0x000000); - graphics.resumegamemode = true; - obj.removeallblocks(); - game.activeactivity = -1; - if (game.menupage >= 20) - { - game.state = 96; - game.statedelay = 0; - } - else - { - game.state = 80; - game.statedelay = 0; - } - } - if (!game.jumpheld) { if (game.press_action || game.press_left || game.press_right || game.press_map)