1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00

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.
This commit is contained in:
Info Teddy 2020-01-22 16:26:29 -08:00 committed by Ethan Lee
parent bff9b850b7
commit cb642ec506

View file

@ -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;
}