mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-22 04:21:23 +00:00
Correct ceilingz handling in quicksand
This commit is contained in:
parent
9499d16221
commit
9e9e3f4cca
1 changed files with 4 additions and 4 deletions
|
@ -2135,9 +2135,9 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
|
||||||
tmfloorslope = NULL;
|
tmfloorslope = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (thing->eflags & MFE_VERTICALFLIP && thingtop < topheight && bottomheight < thing->z)
|
else if (thing->eflags & MFE_VERTICALFLIP && thing->z < topheight && bottomheight < thingtop)
|
||||||
{
|
{
|
||||||
if (tmceilingz < thingtop) {
|
if (tmceilingz > thingtop) {
|
||||||
tmceilingz = thingtop;
|
tmceilingz = thingtop;
|
||||||
tmceilingrover = rover;
|
tmceilingrover = rover;
|
||||||
tmceilingslope = NULL;
|
tmceilingslope = NULL;
|
||||||
|
@ -5101,8 +5101,8 @@ fixed_t P_CeilingzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
|
||||||
{
|
{
|
||||||
if (thingtop > bottomheight && topheight > z)
|
if (thingtop > bottomheight && topheight > z)
|
||||||
{
|
{
|
||||||
if (ceilingz > z)
|
if (ceilingz > thingtop)
|
||||||
ceilingz = z;
|
ceilingz = thingtop;
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue