mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'follower-unlock-fix' into 'master'
Follower visual unlock fix See merge request KartKrew/Kart!899
This commit is contained in:
commit
1ef90e92b3
1 changed files with 6 additions and 3 deletions
|
|
@ -1106,7 +1106,8 @@ static void M_DrawCharSelectCircle(setup_player_t *p, INT16 x, INT16 y)
|
||||||
n = numfollowers-1;
|
n = numfollowers-1;
|
||||||
if (n == startfollowern)
|
if (n == startfollowern)
|
||||||
break;
|
break;
|
||||||
if (followers[n].category == setup_followercategories[p->followercategory][1])
|
if (followers[n].category == setup_followercategories[p->followercategory][1]
|
||||||
|
&& K_FollowerUsable(n))
|
||||||
r--;
|
r--;
|
||||||
}
|
}
|
||||||
l = r = n;
|
l = r = n;
|
||||||
|
|
@ -1121,7 +1122,8 @@ static void M_DrawCharSelectCircle(setup_player_t *p, INT16 x, INT16 y)
|
||||||
if (l == startfollowern)
|
if (l == startfollowern)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
while (followers[l].category != setup_followercategories[p->followercategory][1]);
|
while (followers[l].category != setup_followercategories[p->followercategory][1]
|
||||||
|
|| !K_FollowerUsable(l));
|
||||||
n = l;
|
n = l;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -1134,7 +1136,8 @@ static void M_DrawCharSelectCircle(setup_player_t *p, INT16 x, INT16 y)
|
||||||
if (r == startfollowern)
|
if (r == startfollowern)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
while (followers[r].category != setup_followercategories[p->followercategory][1]);
|
while (followers[r].category != setup_followercategories[p->followercategory][1]
|
||||||
|
|| !K_FollowerUsable(r));
|
||||||
n = r;
|
n = r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue