mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-25 02:59:44 +01:00
Code Issues Releases Wiki Activity

Only reset fade booleans when music is actually played

Browse source 
Otherwise, the block that fades existing music out if m_doFadeOutVol is
true will never execute, because m_doFadeOutVol would always be false!
This commit is contained in:
Misa 2021-09-03 16:38:34 -07:00
parent 6f315af42d
commit 70d3c999be
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
desktop_version/src/Music.cpp
View file

@ -202,9 +202,6 @@ void musicclass::play(int t)
return; return;
} }
m_doFadeInVol = false;
m_doFadeOutVol = false;
if (currentsong == 0 || currentsong == 7 || (!map.custommode && (currentsong == 0+num_mmmmmm_tracks || currentsong == 7+num_mmmmmm_tracks))) if (currentsong == 0 || currentsong == 7 || (!map.custommode && (currentsong == 0+num_mmmmmm_tracks || currentsong == 7+num_mmmmmm_tracks)))
{ {
// Level Complete theme, no fade in or repeat // Level Complete theme, no fade in or repeat
@ -214,6 +211,8 @@ void musicclass::play(int t)
} }
else else
{ {
m_doFadeInVol = false;
m_doFadeOutVol = false;
musicVolume = MIX_MAX_VOLUME; musicVolume = MIX_MAX_VOLUME;
Mix_VolumeMusic(musicVolume); Mix_VolumeMusic(musicVolume);
} }
@ -242,6 +241,8 @@ void musicclass::play(int t)
} }
else else
{ {
m_doFadeInVol = false;
m_doFadeOutVol = false;
fadeMusicVolumeIn(3000); fadeMusicVolumeIn(3000);
} }
} }