stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-04-04 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'musicplus-core' into musicplus-sdlmixerx

Browse source
This commit is contained in:
mazmazz 2018-09-18 12:51:55 -04:00
commit f079c9170f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/sdl/mixer_sound.c
View file

@ -1263,6 +1263,8 @@ boolean I_PlaySong(boolean looping)
void I_StopSong(void)
{
I_StopFadingSong();
#ifdef HAVE_LIBGME
if (gme)
{
@ -1272,12 +1274,12 @@ void I_StopSong(void)
#endif
if (music)
{
var_cleanup();
I_StopFadingSong();
Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes);
Mix_HookMusicFinished(NULL);
Mix_HaltMusic();
}
var_cleanup();
}
void I_PauseSong()