From f28fcd78e823470f592c081f0ad69edfb39d82bf Mon Sep 17 00:00:00 2001 From: Misa Date: Sat, 4 Jul 2020 22:55:21 -0700 Subject: [PATCH] Fix softlock from interrupted completestop In summary, if you got to gamestate 1002 or 1012 without an advancetext, and you had completestop on, you were basically softlocked. So just add those gamestates there and advance the gamestate if advancetext is off. --- desktop_version/src/Game.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index 8213d458..7d735280 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -2085,6 +2085,13 @@ void Game::updatestate() } } break; + case 1002: + if (!advancetext) + { + // Prevent softlocks if we somehow don't have advancetext + state++; + } + break; case 1003: graphics.textboxremove(); hascontrol = true; @@ -2152,6 +2159,13 @@ void Game::updatestate() graphics.textboxcenterx(); } break; + case 1012: + if (!advancetext) + { + // Prevent softlocks if we somehow don't have advancetext + state++; + } + break; case 1013: graphics.textboxremove(); hascontrol = true;