From d6389637ca51e4703b8b16a1af29a065199a07da Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 27 Sep 2020 10:28:14 -0400 Subject: [PATCH] Prevent steal damage first --- src/p_inter.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index dd021c6b4..242955e7c 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1843,23 +1843,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da // If not, then spawn the instashield effect instead. if (!force) { - if (player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_hyudorotimer] > 0) - { - // Full invulnerability - K_DoInstashield(player); - return false; - } - - if (combo == false) - { - if (player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || (player->kartstuff[k_spinouttimer] > 0 && player->kartstuff[k_spinouttype] != 2)) - { - // Post-hit invincibility - K_DoInstashield(player); - return false; - } - } - if (gametyperules & GTR_BUMPERS) { if ((player->kartstuff[k_bumper] <= 0 && player->kartstuff[k_comebacktimer]) || player->kartstuff[k_comebackmode] == 1) @@ -1878,6 +1861,23 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da return false; } } + + if (player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_hyudorotimer] > 0) + { + // Full invulnerability + K_DoInstashield(player); + return false; + } + + if (combo == false) + { + if (player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || (player->kartstuff[k_spinouttimer] > 0 && player->kartstuff[k_spinouttype] != 2)) + { + // Post-hit invincibility + K_DoInstashield(player); + return false; + } + } } // We successfully hit 'em!