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; + } }