From 711b36c9c815a4fc8ba76277fe2c230596b9e9b4 Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 12 Apr 2021 09:27:04 -0700 Subject: [PATCH] Set currentsong to -1 when halting music This is 2.2 behavior, which I forgot to keep. Otherwise, if music has halted and you try to play the same track, it simply won't work, because the current song is the same as the song you're trying to play. This is what happened with the trinket scripts - the game halted music, then tried to play the same track. Fixes #712. --- desktop_version/src/Music.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp index fb116638..e02816f1 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -268,6 +268,7 @@ void musicclass::haltdasmusik(void) { /* Just pauses music. This is intended. */ pause(); + currentsong = -1; } void musicclass::silencedasmusik(void)