From 7eabad83a1180c6a3bde0a7a1cf6e4901fe5d582 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Wed, 15 Aug 2018 02:03:04 -0400 Subject: [PATCH] Another loop fix to resolve music_bytes not resetting on non-looppoint tracks # Conflicts: # src/sdl12/mixer_sound.c --- src/sdl/mixer_sound.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index a82187b26..69e46919f 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -723,15 +723,14 @@ boolean I_StartDigSong(const char *musicname, boolean looping) } } - if (Mix_PlayMusic(music, looping && loop_point == 0.0f ? -1 : 0) == -1) + if (Mix_PlayMusic(music, 0) == -1) { CONS_Alert(CONS_ERROR, "Mix_PlayMusic: %s\n", Mix_GetError()); return true; } Mix_VolumeMusic((UINT32)music_volume*128/31); - if (loop_point != 0.0f) - Mix_HookMusicFinished(music_loop); + Mix_HookMusicFinished(music_loop); music_bytes = 0; if(!Mix_RegisterEffect(MIX_CHANNEL_POST, count_music_bytes, NULL, NULL))