mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-12-02 09:12:54 +00:00
Merge branch 'public-musicplus-core' into public-musicplus-feature-endoflevel
This commit is contained in:
commit
0bc6b2e4d8
1 changed files with 1 additions and 1 deletions
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue