thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ready explosion sound not playing

Browse source
This commit is contained in:
Sally Coolatta 2022-08-29 02:16:09 -04:00
parent 7924805d2b
commit 8ae4bba36d
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/k_menufunc.c
View file

@ -2466,9 +2466,9 @@ static void M_HandleCharAskChange(setup_player_t *p, UINT8 num)
} }
else if (M_MenuConfirmPressed(num)) else if (M_MenuConfirmPressed(num))
{ {
// no changes
if (!p->changeselect) if (!p->changeselect)
{ {
// no changes
M_GetFollowerState(p); M_GetFollowerState(p);
p->mdepth = CSSTEP_READY; p->mdepth = CSSTEP_READY;
p->delay = TICRATE; p->delay = TICRATE;
@ -2476,13 +2476,14 @@ static void M_HandleCharAskChange(setup_player_t *p, UINT8 num)
S_StartSound(NULL, sfx_s3k4e); S_StartSound(NULL, sfx_s3k4e);
M_SetupReadyExplosions(p); M_SetupReadyExplosions(p);
} }
// changes
else else
{
// changes
p->mdepth = CSSTEP_CHARS; p->mdepth = CSSTEP_CHARS;
S_StartSound(NULL, sfx_s3k63);
}
M_SetMenuDelay(num); M_SetMenuDelay(num);
S_StartSound(NULL, sfx_s3k63);
} }
} }
@ -2667,18 +2668,19 @@ static void M_HandleColorRotate(setup_player_t *p, UINT8 num)
{ {
p->mdepth = CSSTEP_FOLLOWER; p->mdepth = CSSTEP_FOLLOWER;
M_GetFollowerState(p); M_GetFollowerState(p);
S_StartSound(NULL, sfx_s3k63);
//p->delay = TICRATE;
//M_SetupReadyExplosions(p);
//S_StartSound(NULL, sfx_s3k4e);
M_SetMenuDelay(num); M_SetMenuDelay(num);
} }
else if (M_MenuBackPressed(num)) else if (M_MenuBackPressed(num))
{ {
if (setup_chargrid[p->gridx][p->gridy].numskins == 1) if (setup_chargrid[p->gridx][p->gridy].numskins == 1)
{
p->mdepth = CSSTEP_CHARS; // Skip clones menu p->mdepth = CSSTEP_CHARS; // Skip clones menu
}
else else
{
p->mdepth = CSSTEP_ALTS; p->mdepth = CSSTEP_ALTS;
}
S_StartSound(NULL, sfx_s3k5b); S_StartSound(NULL, sfx_s3k5b);
M_SetMenuDelay(num); M_SetMenuDelay(num);
} }
@ -2714,8 +2716,6 @@ static void M_AnimateFollower(setup_player_t *p)
static void M_HandleFollowerRotate(setup_player_t *p, UINT8 num) static void M_HandleFollowerRotate(setup_player_t *p, UINT8 num)
{ {
UINT8 numclones = setup_chargrid[p->gridx][p->gridy].numskins;
if (cv_splitdevice.value) if (cv_splitdevice.value)
num = 0; num = 0;
@ -2789,7 +2789,7 @@ static void M_HandleFollowerColorRotate(setup_player_t *p, UINT8 num)
S_StartSound(NULL, sfx_s3k5b); //sfx_s3kc3s S_StartSound(NULL, sfx_s3k5b); //sfx_s3kc3s
} }
if (M_MenuConfirmPressed(num) /*|| M_MenuButtonPressed(num, MBT_START)*/) if (M_MenuConfirmPressed(num) /*|| M_MenuButtonPressed(num, MBT_START)*/)
{ {
p->mdepth = CSSTEP_READY; p->mdepth = CSSTEP_READY;
p->delay = TICRATE; p->delay = TICRATE;