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_AttemptToRestoreMusic

Browse source 
Per review, combine all spots where s_sound.c attempts to restore music into one gamestate-specific switch case system.
This commit is contained in:
toaster 2023-03-29 12:56:28 +01:00
parent 9a343bd465
commit b1b6756e6a
1 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/s_sound.c
View file

@ -1354,6 +1354,24 @@ static UINT32 queue_fadeinms;
static tic_t pause_starttic; static tic_t pause_starttic;
static void S_AttemptToRestoreMusic(void)
{
switch (gamestate)
{
case GS_LEVEL:
P_RestoreMusic(&players[consoleplayer]);
break;
case GS_TITLESCREEN:
S_ChangeMusicInternal("_title", looptitle);
break;
case GS_MENU:
M_PlayMenuJam();
break;
default:
break;
}
}
/// ------------------------ /// ------------------------
/// Music Definitions /// Music Definitions
/// ------------------------ /// ------------------------
@ -1609,10 +1627,7 @@ void S_SoundTestStop(boolean pause)
soundtest.current = NULL; soundtest.current = NULL;
soundtest.currenttrack = 0; soundtest.currenttrack = 0;
if (gamestate == GS_LEVEL) S_AttemptToRestoreMusic();
{
P_RestoreMusic(&players[consoleplayer]);
}
} }
soundtest.privilegedrequest = false; soundtest.privilegedrequest = false;
@ -2891,18 +2906,7 @@ static void Command_RestartAudio_f(void)
S_StartSound(NULL, sfx_strpst); S_StartSound(NULL, sfx_strpst);
if (gamestate == GS_LEVEL) // Gotta make sure the player is in a level S_AttemptToRestoreMusic();
{
P_RestoreMusic(&players[consoleplayer]);
}
else if (gamestate == GS_TITLESCREEN)
{
S_ChangeMusicInternal("_title", looptitle);
}
else
{
M_PlayMenuJam();
}
} }
static void Command_PlaySound(void) static void Command_PlaySound(void)
@ -3002,18 +3006,7 @@ void GameDigiMusic_OnChange(void)
I_StartupSound(); // will return early if initialised I_StartupSound(); // will return early if initialised
I_InitMusic(); I_InitMusic();
if (gamestate == GS_LEVEL) S_AttemptToRestoreMusic();
{
P_RestoreMusic(&players[consoleplayer]);
}
else if (gamestate == GS_TITLESCREEN)
{
S_ChangeMusicInternal("_title", looptitle);
}
else
{
M_PlayMenuJam();
}
} }
else else
{ {