From 585ff51ec6442bc480914d7a36f1d549fa31c8b6 Mon Sep 17 00:00:00 2001 From: Misa Date: Sun, 26 Apr 2020 19:35:41 -0700 Subject: [PATCH] Call hardreset() when returning to menu from editor During testing, I made a cursed level that set the flash timer to precisely 1,000,000 frames. It turns out that if I activated the timer in playtesting, exited playtesting, and exited the editor without ever re-entering playtesting, the timer still kept going. So to prevent being able to do that, we should hardreset() when exiting the editor. --- desktop_version/src/editor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp index 4df39e00..48d3d0c6 100644 --- a/desktop_version/src/editor.cpp +++ b/desktop_version/src/editor.cpp @@ -3451,6 +3451,7 @@ void editorlogic() map.nexttowercolour(); map.colstate = 10; game.gamestate = TITLEMODE; + script.hardreset(); graphics.fademode = 4; music.haltdasmusik(); music.play(6);