thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

s_sound.c - Add exceptions for demo.rewinding and demo.title to all new music setter functions introduced with 2.2 merge

Browse source
This commit is contained in:
toaster 2023-02-04 17:11:46 +00:00
parent 84a98475ff
commit e67fea3b84
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/s_sound.c
View file

@ -1761,6 +1761,10 @@ UINT32 S_GetMusicLoopPoint(void)
boolean S_SetMusicPosition(UINT32 position) boolean S_SetMusicPosition(UINT32 position)
{ {
if (demo.rewinding // Don't mess with music while rewinding!
|| demo.title) // SRB2Kart: Demos don't interrupt title screen music
return false;
return I_SetSongPosition(position); return I_SetSongPosition(position);
} }
@ -1962,7 +1966,13 @@ boolean S_RecallMusic(UINT16 status, boolean fromfirst)
UINT32 newpos = 0; UINT32 newpos = 0;
boolean mapmuschanged = false; boolean mapmuschanged = false;
musicstack_t *result; musicstack_t *result;
musicstack_t *entry = Z_Calloc(sizeof (*result), PU_MUSIC, NULL); musicstack_t *entry;
if (demo.rewinding // Don't mess with music while rewinding!
|| demo.title) // SRB2Kart: Demos don't interrupt title screen music
return false;
entry = Z_Calloc(sizeof (*result), PU_MUSIC, NULL);
if (status) if (status)
result = S_GetMusicStackEntry(status, fromfirst, -1); result = S_GetMusicStackEntry(status, fromfirst, -1);
@ -2387,6 +2397,10 @@ void S_StopFadingMusic(void)
boolean S_FadeMusicFromVolume(UINT8 target_volume, INT16 source_volume, UINT32 ms) boolean S_FadeMusicFromVolume(UINT8 target_volume, INT16 source_volume, UINT32 ms)
{ {
if (demo.rewinding // Don't mess with music while rewinding!
|| demo.title) // SRB2Kart: Demos don't interrupt title screen music
return false;
if (source_volume < 0) if (source_volume < 0)
return I_FadeSong(target_volume, ms, NULL); return I_FadeSong(target_volume, ms, NULL);
else else
@ -2395,6 +2409,10 @@ boolean S_FadeMusicFromVolume(UINT8 target_volume, INT16 source_volume, UINT32 m
boolean S_FadeOutStopMusic(UINT32 ms) boolean S_FadeOutStopMusic(UINT32 ms)
{ {
if (demo.rewinding // Don't mess with music while rewinding!
|| demo.title) // SRB2Kart: Demos don't interrupt title screen music
return false;
return I_FadeSong(0, ms, &S_StopMusic); return I_FadeSong(0, ms, &S_StopMusic);
} }