From cb642ec506fb1be4ca32aa666036d95e823b6a7d Mon Sep 17 00:00:00 2001 From: Info Teddy Date: Wed, 22 Jan 2020 16:26:29 -0800 Subject: [PATCH] Don't quick fade when using niceplay() Earlier in 53950e14de65a54d9369c5183a16337782d3dc4e, I made playing a song while a song was already fading quickly fade out the current song, but then added an exception for if the fade came from the musicfadeout() command. This commit adds another exception for if the fade came from niceplay(), since otherwise the music transitions between areas in the game would go too quick. --- desktop_version/src/Music.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp index e6566b79..d162bf6e 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -414,7 +414,11 @@ void musicclass::niceplay(int t) // important: do nothing if the correct song is playing! if(currentsong!=t) { - if(currentsong!=-1) fadeout(); + if(currentsong!=-1) + { + dontquickfade = true; + fadeout(); + } nicefade = 1; nicechange = t; }