mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-11-14 15:09:42 +01:00
Code Issues Releases Wiki Activity

Move resumesong assignment to songend()

Browse source 
This fixes a bug where the resumemusic() script command would always
play MMMMMM track 15 (or, if you're using PPPPPP, just not work). This
is because musicclass::haltdasmusik() assigns resumesong AFTER calling
Mix_HaltMusic(), but the songend() callback fires before the resumesong
assignment, meaning resumesong gets set to -1 instead of whatever
currentsong was previously.

To fix this, just move the assignment into the callback itself (I don't
know why this wasn't done before). I could have moved it to before the
Mix_HaltMusic() call, but moving it into the callback itself fixes it
for all cases of the music stopping (such as when the music fades out).
This commit is contained in:
Misa 2021-03-09 21:49:07 -08:00 committed by Ethan Lee
parent d4f52fd6fe
commit babd86916c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop_version/src/Music.cpp
View file

@ -145,6 +145,7 @@ static void songend(void)
{ {
extern musicclass music; extern musicclass music;
music.songEnd = SDL_GetPerformanceCounter(); music.songEnd = SDL_GetPerformanceCounter();
music.resumesong = music.currentsong;
music.currentsong = -1; music.currentsong = -1;
} }
@ -265,7 +266,6 @@ void musicclass::fadein(void)
void musicclass::haltdasmusik(void) void musicclass::haltdasmusik(void)
{ {
Mix_HaltMusic(); Mix_HaltMusic();
resumesong = currentsong;
} }
void musicclass::silencedasmusik(void) void musicclass::silencedasmusik(void)