zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-12 15:15:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "When compat_floormove is enabled prevent sector floor from lowering if a thing is stuck in the ceiling (vanilla behavior)"

Browse source 
This reverts commit 4ad76f549e.

This broke several maps so the implementation is obviously not correct.
This commit is contained in:
Christoph Oelckers 2023-10-31 08:05:36 +01:00
parent ad778b0bcc
commit 61c2f5f8c0
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/playsim/p_map.cpp
View file

@ -6652,12 +6652,6 @@ int P_PushDown(AActor *thing, FChangePosition *cpos)
void PIT_FloorDrop(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 oldfloorz = thing->floorz;
double oldz = thing->Z(); double oldz = thing->Z();
@ -7033,6 +7027,7 @@ bool P_ChangeSector(sector_t *sector, int crunch, double amt, int floorOrCeil, b
} }
} }
return cpos.nofit; return cpos.nofit;
} }