From c665d5b8c810033eb11b5aa7cdb2f901444cf8aa Mon Sep 17 00:00:00 2001 From: Stelpjo Date: Wed, 12 Feb 2020 16:00:54 -0500 Subject: [PATCH] Fixed some music bugs Previously, when MMMMMM is installed but the user is using PPPPPP, niceplay would still restart the song even if it's the same. That has been fixed. In addition, Plenary and Path Complete no longer loop when MMMMMM is installed but PPPPPP is in use. --- desktop_version/src/Music.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp index 04c6debf..b3d96cc2 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -246,7 +246,7 @@ void musicclass::play(int t) { // musicfade = 0; currentsong = t; - if (currentsong == 0 || currentsong == 7) + if (currentsong == 0 || currentsong == 7 || currentsong == 16 || currentsong == 23) { // Level Complete theme, no fade in or repeat // musicchannel = musicchan[currentsong].play(0); @@ -412,7 +412,7 @@ void musicclass::processmusic() void musicclass::niceplay(int t) { // important: do nothing if the correct song is playing! - if(currentsong!=t) + if((!mmmmmm && currentsong!=t) || (mmmmmm && usingmmmmmm && currentsong!=t) || (mmmmmm && !usingmmmmmm && currentsong!=t+16)) { if(currentsong!=-1) {