From 96fa8996dbd174a9552b73fb37aa8387273357bb Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 19 Sep 2018 19:18:35 -0400
Subject: [PATCH] MP Core Mixer fade: Use fixed instead of double calc (fixes
buildbots)
---
src/sdl/mixer_sound.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index e5552b0a6b..fc6ccf50cf 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -565,11 +565,11 @@ static UINT32 music_fade(UINT32 interval, void *param)
else
{
UINT8 delta = abs(fading_target - fading_source);
- double factor = (double)(fading_duration - fading_timer) / (double)fading_duration;
+ fixed_t factor = FixedDiv(fading_duration - fading_timer, fading_duration);
if (fading_target < fading_source)
- internal_volume = max(min(internal_volume, fading_source - (UINT8)round(delta * factor)), fading_target);
+ internal_volume = max(min(internal_volume, fading_source - FixedMul(delta, factor)), fading_target);
else if (fading_target > fading_source)
- internal_volume = min(max(internal_volume, fading_source + (UINT8)round(delta * factor)), fading_target);
+ internal_volume = min(max(internal_volume, fading_source + FixedMul(delta, factor)), fading_target);
Mix_VolumeMusic(get_real_volume(music_volume));
return interval;
}
--
GitLab