Merge branch 'public-musicplus-core' into public-musicplus-jingle

This commit is contained in:
mazmazz 2018-09-19 19:56:50 -04:00
commit 7cd1bfb8d7

View file

@ -1850,7 +1850,7 @@ boolean S_FadeMusicFromVolume(UINT8 target_volume, INT16 source_volume, UINT32 m
if (source_volume < 0)
return I_FadeSong(target_volume, ms, NULL);
else
return I_FadeSongFromVolume(target_volume, source_volume, ms, false);
return I_FadeSongFromVolume(target_volume, source_volume, ms, NULL);
}
boolean S_FadeOutStopMusic(UINT32 ms)