From dd222affa27683e26dc274429bc72159722af94a Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 22 Jan 2023 16:38:56 +0000 Subject: [PATCH] M_DrawCharSelectCircle: Fix not checking for follower usability when iterating over valid followers in the selected category --- src/k_menudraw.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/k_menudraw.c b/src/k_menudraw.c index 7cdbb91a7..7d95c9886 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -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; }