From 94c1ab7de267caa54ef72b42f9512fbea991e127 Mon Sep 17 00:00:00 2001 From: Arthur Date: Sat, 17 Feb 2024 14:12:39 -0500 Subject: [PATCH] Use floorz/ceilingz --- src/p_mobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 9ec667346..0fe850018 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -2329,9 +2329,9 @@ boolean P_CheckDeathPitCollide(mobj_t *mo) if (mo->player && mo->player->pflags & PF_GODMODE) return false; - if (((mo->z <= mo->subsector->sector->floorheight + if (((mo->z <= mo->floorz && ((mo->subsector->sector->flags & MSF_TRIGGERSPECIAL_HEADBUMP) || !(mo->eflags & MFE_VERTICALFLIP)) && (mo->subsector->sector->flags & MSF_FLIPSPECIAL_FLOOR)) - || (mo->z + mo->height >= mo->subsector->sector->ceilingheight + || (mo->z + mo->height >= mo->ceilingz && ((mo->subsector->sector->flags & MSF_TRIGGERSPECIAL_HEADBUMP) || (mo->eflags & MFE_VERTICALFLIP)) && (mo->subsector->sector->flags & MSF_FLIPSPECIAL_CEILING))) && (mo->subsector->sector->damagetype == SD_DEATHPITTILT || mo->subsector->sector->damagetype == SD_DEATHPITNOTILT))