From 4a239e024c555900c79fe167c5d1805ff74c3276 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 2 May 2024 19:53:50 -0700
Subject: [PATCH] Fix fallback follower
---
src/k_follower.c | 2 +-
src/k_kart.c | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/k_follower.c b/src/k_follower.c
index 55f68fba37..8e5fb18321 100644
--- a/src/k_follower.c
+++ b/src/k_follower.c
@@ -360,7 +360,7 @@ void K_HandleFollower(player_t *player)
// don't do anything if we can't have a follower to begin with.
// (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))
{
if (player->follower)
diff --git a/src/k_kart.c b/src/k_kart.c
index 5954988227..db6e35cb11 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -12665,7 +12665,11 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
&& player->follower != NULL
&& 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->cvmem = player->follower->y - player->mo->y;
--
GitLab