From 8ca366f2014a542f4a69b898cdaa948e14d19639 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sun, 11 Oct 2009 06:21:55 +0000 Subject: [PATCH] fade_volume_reset should always be set for fade ins. ...as they are new sounds starting. --- mixer.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mixer.c b/mixer.c index 265d407b..c988ea67 100644 --- a/mixer.c +++ b/mixer.c @@ -825,15 +825,11 @@ int Mix_FadeInChannelTimed(int which, Mix_Chunk *chunk, int loops, int ms, int t mix_channel[which].paused = 0; mix_channel[which].fading = MIX_FADING_IN; mix_channel[which].fade_volume = mix_channel[which].volume; + mix_channel[which].fade_volume_reset = mix_channel[which].volume; mix_channel[which].volume = 0; mix_channel[which].fade_length = (Uint32)ms; mix_channel[which].start_time = mix_channel[which].ticks_fade = sdl_ticks; mix_channel[which].expire = (ticks > 0) ? (sdl_ticks+ticks) : 0; - - /* only change fade_volume_reset if we're not fading. */ - if (mix_channel[which].fading == MIX_NO_FADING) { - mix_channel[which].fade_volume_reset = mix_channel[which].volume; - } } } SDL_UnlockAudio();