From d8670bae2070f7679a7372f94418f5fb88b963a2 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Wed, 8 Mar 2023 16:58:15 -0700 Subject: [PATCH] Fix nonfunctional wizard guard for wizards --- src/p_map.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/p_map.c b/src/p_map.c index 07241dccb..eac1f59e2 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -1397,6 +1397,17 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) return BMIT_CONTINUE; } + if (!P_MobjWasRemoved(thing) && !P_MobjWasRemoved(tm.thing)) + { + if (thing->player->eggmanexplode) + { + K_EggmanTransfer(thing->player, tm.thing->player); + } else if (tm.thing->player->eggmanexplode) + { + K_EggmanTransfer(tm.thing->player, thing->player); + } + } + // The bump has to happen last if (P_IsObjectOnGround(thing) && tm.thing->momz < 0 && tm.thing->player->trickpanel) { @@ -1412,17 +1423,6 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing) K_PvPTouchDamage(tm.thing, thing); } - if (!P_MobjWasRemoved(thing) && !P_MobjWasRemoved(tm.thing)) - { - if (thing->player->eggmanexplode) - { - K_EggmanTransfer(thing->player, tm.thing->player); - } else if (tm.thing->player->eggmanexplode) - { - K_EggmanTransfer(tm.thing->player, thing->player); - } - } - return BMIT_CONTINUE; } else if (thing->type == MT_SPECIAL_UFO)