thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-14 07:06:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix being unable to go back to profile select unless you were the last active player

Browse source
This commit is contained in:
SinnamonLat 2022-05-28 13:22:02 +02:00
parent d5e9283c2e
commit 10e23827c0
1 changed files with 9 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/k_menufunc.c
View file

@ -2594,8 +2594,6 @@ static void M_HandleCharAskChange(setup_player_t *p, UINT8 num)
static boolean M_HandleCharacterGrid(setup_player_t *p, UINT8 num)
{
INT32 i;
UINT8 numclones;
if (cv_splitdevice.value)
@ -2662,38 +2660,20 @@ static boolean M_HandleCharacterGrid(setup_player_t *p, UINT8 num)
}
else if (M_MenuBackPressed(num))
{
if (num == setup_numplayers-1)
// for profiles / gameplay, exit out of the menu instantly,
// we don't want to go to the input detection menu.
if (optionsmenu.profile || gamestate != GS_MENU)
{
// for profiles / gameplay, exit out of the menu instantly,
// we don't want to go to the input detection menu.
if (optionsmenu.profile || gamestate != GS_MENU)
{
memset(setup_player, 0, sizeof(setup_player)); // Reset setup_player otherwise it does some VERY funky things.
M_SetMenuDelay(0);
M_GoBack(0);
return true;
}
else // for the actual player select, go back to device detection.
{
p->mdepth = CSSTEP_PROFILE;
S_StartSound(NULL, sfx_s3k5b);
}
// Prevent quick presses for multiple players
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
{
setup_player[i].delay = MENUDELAYTIME;
M_SetMenuDelay(i);
menucmd[i].buttonsHeld |= MBT_X;
}
memset(setup_player, 0, sizeof(setup_player)); // Reset setup_player otherwise it does some VERY funky things.
M_SetMenuDelay(0);
M_GoBack(0);
return true;
}
else
else // in main menu
{
S_StartSound(NULL, sfx_s3kb2);
p->mdepth = CSSTEP_PROFILE;
S_StartSound(NULL, sfx_s3k5b);
}
M_SetMenuDelay(num);
}