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

CharSel: Make sure the clone we're hovering over actually exists

Browse source
This commit is contained in:
SinnamonLat 2022-02-19 22:15:56 +01:00
parent 2789d1d90e
commit 7612d7cdf9
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/k_menufunc.c
View file

@ -2296,6 +2296,8 @@ static boolean M_HandleCharacterGrid(setup_player_t *p, UINT8 num)
{ {
INT32 i; INT32 i;
UINT8 numclones;
if (menucmd[num].dpad_ud > 0) if (menucmd[num].dpad_ud > 0)
{ {
p->gridy++; p->gridy++;
@ -2330,6 +2332,13 @@ static boolean M_HandleCharacterGrid(setup_player_t *p, UINT8 num)
M_SetMenuDelay(num); M_SetMenuDelay(num);
} }
// Process this after possible pad movement,
// this makes sure we don't have a weird ghost hover on a character with no clones.
numclones = setup_chargrid[p->gridx][p->gridy].numskins;
if (p->clonenum >= numclones)
p->clonenum = 0;
if (M_MenuButtonPressed(num, MBT_A) || M_MenuButtonPressed(num, MBT_X) /*|| M_MenuButtonPressed(num, MBT_START)*/) if (M_MenuButtonPressed(num, MBT_A) || M_MenuButtonPressed(num, MBT_X) /*|| M_MenuButtonPressed(num, MBT_START)*/)
{ {
if (setup_chargrid[p->gridx][p->gridy].numskins == 0) if (setup_chargrid[p->gridx][p->gridy].numskins == 0)