From cd38d2ca123c701844b931e731c2cf26345fe005 Mon Sep 17 00:00:00 2001 From: Misa Date: Tue, 27 Apr 2021 16:57:32 -0700 Subject: [PATCH] Reset fade booleans when starting music This fixes issues with music playing, only for it to fade out afterwards. This happened if tracks 0 or 7 were played after fading out, because playing other tracks reset the fade booleans (by calling a fade-in), but not tracks 0 or 7. --- desktop_version/src/Music.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp index df493baf..b3214b3b 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -200,6 +200,9 @@ void musicclass::play(int t) return; } + m_doFadeInVol = false; + m_doFadeOutVol = false; + if (currentsong == 0 || currentsong == 7 || (!map.custommode && (currentsong == 0+num_mmmmmm_tracks || currentsong == 7+num_mmmmmm_tracks))) { // Level Complete theme, no fade in or repeat