Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel

This commit is contained in:
mazmazz 2018-09-19 19:56:54 -04:00
commit 0bc6b2e4d8

View file

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