From 99ae4b7c4c8112ef12e2d6a40c9c15ed1ca8db6b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 31 Oct 2023 08:05:36 +0100 Subject: [PATCH] Revert "When compat_floormove is enabled prevent sector floor from lowering if a thing is stuck in the ceiling (vanilla behavior)" This reverts commit 4ad76f549e29a42b809879364b9a1af73bae5146. This broke several maps so the implementation is obviously not correct. --- src/playsim/p_map.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/playsim/p_map.cpp b/src/playsim/p_map.cpp index edb865b165..797feb8e75 100644 --- a/src/playsim/p_map.cpp +++ b/src/playsim/p_map.cpp @@ -6652,12 +6652,6 @@ int P_PushDown(AActor *thing, FChangePosition *cpos) void PIT_FloorDrop(AActor *thing, FChangePosition *cpos) { - if ((thing->Level->i_compatflags2 & COMPATF2_FLOORMOVE) && (thing->Top() > thing->ceilingz)) - { - cpos->nofit = true; - return; - } - double oldfloorz = thing->floorz; double oldz = thing->Z(); @@ -7033,6 +7027,7 @@ bool P_ChangeSector(sector_t *sector, int crunch, double amt, int floorOrCeil, b } } + return cpos.nofit; }