From e571081f92680b5fc4ce1499818e12423532eceb Mon Sep 17 00:00:00 2001 From: Misa Date: Fri, 3 Apr 2020 15:37:59 -0700 Subject: [PATCH] Un-fix using-PPPPPP-while-MMMMMM-present for custom levels As discussed earlier, some custom levels have taken advantage of the fact that songs 0 and 7 loop and also fade in when using PPPPPP while having an mmmmmm.vvv file present. --- desktop_version/src/Music.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp index ee51d2d7..45798a21 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -2,6 +2,7 @@ #include #include "Music.h" #include "BinaryBlob.h" +#include "Map.h" void musicclass::init() { @@ -237,7 +238,7 @@ void musicclass::play(int t) { // musicfade = 0; currentsong = t; - if (currentsong == 0 || currentsong == 7 || currentsong == 16 || currentsong == 23) + if (currentsong == 0 || currentsong == 7 || (!map.custommode && (currentsong == 16 || currentsong == 23))) { // Level Complete theme, no fade in or repeat if(Mix_FadeInMusic(musicTracks[t].m_music, 0, 0)==-1)