thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-23 16:32:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix fallback follower

Browse source
This commit is contained in:
James R 2024-05-02 19:53:50 -07:00
parent 3b27feb533
commit 4a239e024c
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_follower.c
View file

@ -360,7 +360,7 @@ void K_HandleFollower(player_t *player)
// don't do anything if we can't have a follower to begin with. // don't do anything if we can't have a follower to begin with.
// (It gets removed under those conditions) // (It gets removed under those conditions)
if (player->spectator || player->followerskin < 0 && !fallbackfollower if (player->spectator || (player->followerskin < 0 && !fallbackfollower)
|| player->mo == NULL || P_MobjWasRemoved(player->mo)) || player->mo == NULL || P_MobjWasRemoved(player->mo))
{ {
if (player->follower) if (player->follower)

6
src/k_kart.c
View file

@ -12665,7 +12665,11 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
&& player->follower != NULL && player->follower != NULL
&& P_MobjWasRemoved(player->follower) == false) && P_MobjWasRemoved(player->follower) == false)
{ {
const follower_t *fl = &followers[player->followerskin]; const follower_t *fl = &followers[
player->followerskin == -1
? K_FollowerAvailable("Goddess")
: player->followerskin
];
ring->cusval = player->follower->x - player->mo->x; ring->cusval = player->follower->x - player->mo->x;
ring->cvmem = player->follower->y - player->mo->y; ring->cvmem = player->follower->y - player->mo->y;