From fed08744babf0e096a4a3c6dee702a044568bc2c Mon Sep 17 00:00:00 2001
From: sphere <spherallic@gmail.com>
Date: Mon, 19 Feb 2024 23:50:56 +0000
Subject: [PATCH] Revert "Merge branch 'issue1150' into 'next'"

This reverts merge request !2334
---
 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 628280a8d..acee8733f 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->floorz
+	if (((mo->z <= mo->subsector->sector->floorheight
 		&& ((mo->subsector->sector->flags & MSF_TRIGGERSPECIAL_HEADBUMP) || !(mo->eflags & MFE_VERTICALFLIP)) && (mo->subsector->sector->flags & MSF_FLIPSPECIAL_FLOOR))
-	|| (mo->z + mo->height >= mo->ceilingz
+	|| (mo->z + mo->height >= mo->subsector->sector->ceilingheight
 		&& ((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))
-- 
GitLab