From 08b2c09fe121a4667ad442be4d1b68f4559665ef Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sat, 24 Sep 2022 16:15:25 -0400 Subject: [PATCH] Swap them --- src/k_collide.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/k_collide.c b/src/k_collide.c index f4caef1fb..242130a18 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -882,21 +882,6 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2) return false; } - // Cause stumble on scale difference - t1Condition = (t1->scale > t2->scale + (mapobjectscale/8)); - t2Condition = (t2->scale > t1->scale + (mapobjectscale/8)); - - if (t1Condition == true && t2Condition == false) - { - K_StumblePlayer(t2->player); - return true; - } - else if (t1Condition == false && t2Condition == true) - { - K_StumblePlayer(t1->player); - return true; - } - // Cause tumble on invincibility t1Condition = (t1->player->invincibilitytimer > 0); t2Condition = (t2->player->invincibilitytimer > 0); @@ -912,6 +897,21 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2) return true; } + // Cause stumble on scale difference + t1Condition = (t1->scale > t2->scale + (mapobjectscale/8)); + t2Condition = (t2->scale > t1->scale + (mapobjectscale/8)); + + if (t1Condition == true && t2Condition == false) + { + K_StumblePlayer(t2->player); + return true; + } + else if (t1Condition == false && t2Condition == true) + { + K_StumblePlayer(t1->player); + return true; + } + // Flame Shield dash damage t1Condition = (t1->player->flamedash > 0 && t1->player->itemtype == KITEM_FLAMESHIELD); t2Condition = (t2->player->flamedash > 0 && t2->player->itemtype == KITEM_FLAMESHIELD);