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

M_DrawCharSelectCircle: Fix not checking for follower usability when iterating over valid followers in the selected category

Browse source
This commit is contained in:
toaster 2023-01-22 16:38:56 +00:00
parent f47d818698
commit dd222affa2
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/k_menudraw.c
View file

@ -1106,7 +1106,8 @@ static void M_DrawCharSelectCircle(setup_player_t *p, INT16 x, INT16 y)
n = numfollowers-1;
if (n == startfollowern)
break;
if (followers[n].category == setup_followercategories[p->followercategory][1])
if (followers[n].category == setup_followercategories[p->followercategory][1]
&& K_FollowerUsable(n))
r--;
}
l = r = n;
@ -1121,7 +1122,8 @@ static void M_DrawCharSelectCircle(setup_player_t *p, INT16 x, INT16 y)
if (l == startfollowern)
break;
}
while (followers[l].category != setup_followercategories[p->followercategory][1]);
while (followers[l].category != setup_followercategories[p->followercategory][1]
|| !K_FollowerUsable(l));
n = l;
}
else
@ -1134,7 +1136,8 @@ static void M_DrawCharSelectCircle(setup_player_t *p, INT16 x, INT16 y)
if (r == startfollowern)
break;
}
while (followers[r].category != setup_followercategories[p->followercategory][1]);
while (followers[r].category != setup_followercategories[p->followercategory][1]
|| !K_FollowerUsable(r));
n = r;
}