Skip to content
Snippets Groups Projects
Commit de47ab63 authored by Marco Z's avatar Marco Z
Browse files

MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots)

parent 1da3b921
No related branches found
No related tags found
No related merge requests found
...@@ -565,11 +565,11 @@ static UINT32 music_fade(UINT32 interval, void *param) ...@@ -565,11 +565,11 @@ static UINT32 music_fade(UINT32 interval, void *param)
else else
{ {
UINT8 delta = abs(fading_target - fading_source); 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) 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) 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)); Mix_VolumeMusic(get_real_volume(music_volume));
return interval; return interval;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment