From 05a1a3c086a216ca2eb5d9419cc18caf39f7f8fa Mon Sep 17 00:00:00 2001 From: Misa Date: Sun, 31 Mar 2024 23:09:35 -0700 Subject: [PATCH] Disable state locking if inc'ing state w/ ACTION This fixes a bug report from Elomavi that you could still softlock from warping to ship and incrementing the gamestate by pressing ACTION, which is diverging behavior from how it was in 2.3. Warping to ship and incrementing by pressing ACTION is useful behavior for a couple niche speedrun categories. I had already fixed this earlier by ignoring state locking if glitchrunner 2.2 or 2.0 was enabled, but softlocks could still happen because having glitchrunner mode off still enabled you to increment the gamestate when otherwise unintended. Softlocks shouldn't happen. But without removing state locking entirely, I've chosen a middle ground where it will only be disabled if you press ACTION. That signifies intent that you still want to perform state incrementing glitches even with glitchrunner mode off (but in the future it could be considered a 2.3/2.4 glitch that could be patched and made re-enable-able). That way, casual players can't interrupt the warp to ship by accident (unless they accidentally press ACTION) while softlocks will be removed. --- desktop_version/src/Input.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index aab9a9a6..468c265a 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -2617,6 +2617,7 @@ void gameinput(void) || !game.glitchrunkludge) { game.state++; + game.unlockstate(); } game.jumpheld = true; game.glitchrunkludge=true;