Compare commits

..

No commits in common. "5e557ffd1a96949810f25982f24b0eafb9b65bac" and "8e5714439ac572d6c8265c4e6701c1f67361aa01" have entirely different histories.

2 changed files with 4 additions and 2 deletions

View File

@ -2319,7 +2319,9 @@ void mapmenuactionpress()
//This fixes an apparent frame flicker.
FillRect(graphics.tempBuffer, 0x000000);
graphics.fademode = 2;
music.fadeout();
if (music.currentsong != 6) {
music.fadeout();
}
map.nexttowercolour();
if (!game.glitchrunnermode)
{

View File

@ -188,7 +188,7 @@ void musicclass::play(int t, const double position_sec /*= 0.0*/, const int fade
safeToProcessMusic = true;
musicVolume = MIX_MAX_VOLUME;
if (currentsong == t && Mix_PlayingMusic() != MIX_FADING_OUT)
if (currentsong == t)
{
return;
}