From ce1fe0028a05e69f8f8f41a1a4b6a94dec7723d7 Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 13 Jan 2024 19:17:57 -0800 Subject: [PATCH] Insta-Whip: respect flashing tics unless player is in damage state - Matches new flashing tics behavior --- src/k_collide.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/k_collide.cpp b/src/k_collide.cpp index afc72e998..b9fc3c391 100644 --- a/src/k_collide.cpp +++ b/src/k_collide.cpp @@ -822,8 +822,7 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim) { player_t *victimPlayer = victim->player; - //if (victim != attacker && !P_PlayerInPain(victimPlayer) && victimPlayer->flashing == 0) - if (victim != attacker && victim->hitlag == 0) + if (victim != attacker && (P_PlayerInPain(victimPlayer) ? victim->hitlag == 0 : victimPlayer->flashing == 0)) { // If both players have a whip, hits are order-of-execution dependent and that sucks. // Player expectation is a clash here.