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.
This commit is contained in:
Misa 2024-03-31 23:09:35 -07:00
parent ff785aaa8a
commit 05a1a3c086
1 changed files with 1 additions and 0 deletions

View File

@ -2617,6 +2617,7 @@ void gameinput(void)
|| !game.glitchrunkludge)
{
game.state++;
game.unlockstate();
}
game.jumpheld = true;
game.glitchrunkludge=true;