incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix buggy monitor collision in Kart Airlines and remove unused variables

Browse source
This commit is contained in:
Wumbo 2024-09-08 18:26:36 -04:00
parent 227938e907
commit 3735ff2eb0
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/p_map.c
View file

@ -2396,7 +2396,7 @@ increment_move
fixed_t tryx = thing->x;
fixed_t tryy = thing->y;
fixed_t radius = thing->radius;
fixed_t thingtop;
fixed_t thingtop = thing->z + thing->height;
floatok = false;
// reset this to 0 at the start of each trymove call as it's only used here
@ -2454,15 +2454,10 @@ increment_move
if (maxstep > 0)
{
const boolean flipped =
(thing->eflags & MFE_VERTICALFLIP) != 0;
thingtop = thing->z + thing->height;
// Step up
if (thing->z < tmfloorz)
{
if (tmfloorstep <= maxstep)
if (tmfloorz - thing->z <= maxstep)
{
thing->z = thing->floorz = tmfloorz;
thing->floorrover = tmfloorrover;
@ -2475,7 +2470,7 @@ increment_move
}
else if (tmceilingz < thingtop)
{
if (tmceilingstep <= maxstep)
if (thingtop - tmceilingz <= maxstep)
{
thing->z = ( thing->ceilingz = tmceilingz ) - thing->height;
thing->ceilingrover = tmceilingrover;
@ -2553,8 +2548,6 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
fixed_t oldx = thing->x;
fixed_t oldy = thing->y;
fixed_t startingonground = P_IsObjectOnGround(thing);
fixed_t stairjank = 0;
pslope_t *oldslope = thing->standingslope;
// The move is ok!
if (!increment_move(thing, x, y, allowdropoff))