From ba3a3f4203b6ba23dbbf596a0c7e875c88428356 Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 8 Jan 2023 16:51:58 +0000 Subject: [PATCH] Follower hitlag - If a player enters hitlag, put their follower in hitlag too - If a follower exists and is in hitlag, don't update it in K_HandleFollower --- src/k_follower.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/k_follower.c b/src/k_follower.c index 41623d57e..f0a1d7748 100644 --- a/src/k_follower.c +++ b/src/k_follower.c @@ -406,6 +406,12 @@ void K_HandleFollower(player_t *player) } else // follower exists, woo! { + if (player->follower->hitlag != 0) + { + // Don't update frames in hitlag + return; + } + // first of all, handle states following the same model as above: if (player->follower->tics == 1) { @@ -621,4 +627,11 @@ void K_HandleFollower(player_t *player) K_UpdateFollowerState(player->follower, fl.idlestate, FOLLOWERSTATE_IDLE); } } + + if (player->mo->hitlag) + { + player->follower->hitlag = player->mo->hitlag; + player->follower->eflags |= (player->mo->eflags & MFE_DAMAGEHITLAG); + return; + } }