thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reference count tm.floorthing and tm.hitthing

Browse source
This commit is contained in:
Sally Coolatta 2022-11-21 15:41:24 -05:00
parent b31aa1bbb0
commit 11a6287c80
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/p_map.c
View file

@ -1466,7 +1466,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
tm.ceilingrover = NULL; tm.ceilingrover = NULL;
tm.ceilingslope = NULL; tm.ceilingslope = NULL;
tm.ceilingpic = -1; tm.ceilingpic = -1;
tm.floorthing = thing; // needed for side collision P_SetTarget(&tm.floorthing, thing); // needed for side collision
} }
else if (topz < tm.ceilingz && tm.thing->z <= thing->z+thing->height) else if (topz < tm.ceilingz && tm.thing->z <= thing->z+thing->height)
{ {
@ -1474,7 +1474,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
tm.ceilingrover = NULL; tm.ceilingrover = NULL;
tm.ceilingslope = NULL; tm.ceilingslope = NULL;
tm.ceilingpic = -1; tm.ceilingpic = -1;
tm.floorthing = thing; // thing we may stand on P_SetTarget(&tm.floorthing, thing); // thing we may stand on
} }
} }
else else
@ -1510,7 +1510,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
tm.floorrover = NULL; tm.floorrover = NULL;
tm.floorslope = NULL; tm.floorslope = NULL;
tm.floorpic = -1; tm.floorpic = -1;
tm.floorthing = thing; // needed for side collision P_SetTarget(&tm.floorthing, thing); // needed for side collision
} }
else if (topz > tm.floorz && tm.thing->z+tm.thing->height >= thing->z) else if (topz > tm.floorz && tm.thing->z+tm.thing->height >= thing->z)
{ {
@ -1518,7 +1518,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
tm.floorrover = NULL; tm.floorrover = NULL;
tm.floorslope = NULL; tm.floorslope = NULL;
tm.floorpic = -1; tm.floorpic = -1;
tm.floorthing = thing; // thing we may stand on P_SetTarget(&tm.floorthing, thing); // thing we may stand on
} }
} }
} }
@ -2052,8 +2052,8 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
} }
// tm.floorthing is set when tm.floorz comes from a thing's top // tm.floorthing is set when tm.floorz comes from a thing's top
tm.floorthing = NULL; P_SetTarget(&tm.floorthing, NULL);
tm.hitthing = NULL; P_SetTarget(&tm.hitthing, NULL);
validcount++; validcount++;
@ -2072,9 +2072,14 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
for (by = yl; by <= yh; by++) for (by = yl; by <= yh; by++)
{ {
if (!P_BlockThingsIterator(bx, by, PIT_CheckThing)) if (!P_BlockThingsIterator(bx, by, PIT_CheckThing))
{
blockval = false; blockval = false;
}
else else
tm.hitthing = tm.floorthing; {
P_SetTarget(&tm.hitthing, tm.floorthing);
}
if (P_MobjWasRemoved(tm.thing)) if (P_MobjWasRemoved(tm.thing))
return false; return false;
} }
@ -2452,7 +2457,7 @@ BlockItReturn_t PIT_PushableMoved(mobj_t *thing)
// These are all non-static map variables that are changed for each and every single mobj // These are all non-static map variables that are changed for each and every single mobj
// See, changing player's momx/y would possibly trigger stuff as if the player were running somehow, so this must be done to keep the player standing // See, changing player's momx/y would possibly trigger stuff as if the player were running somehow, so this must be done to keep the player standing
// All this so players can ride gargoyles! // All this so players can ride gargoyles!
tm_t oldtm = {0}; tm_t oldtm = tm;
// Move the player // Move the player
P_TryMove(thing, thing->x + stand->momx, thing->y + stand->momy, true); P_TryMove(thing, thing->x + stand->momx, thing->y + stand->momy, true);
@ -2576,8 +2581,11 @@ increment_move
if (tm.ceilingz - tm.floorz < thing->height) if (tm.ceilingz - tm.floorz < thing->height)
{ {
if (tm.floorthing) if (tm.floorthing != NULL)
tm.hitthing = tm.floorthing; {
P_SetTarget(&tm.hitthing, tm.floorthing);
}
return false; // doesn't fit return false; // doesn't fit
} }

4
src/p_mobj.c
View file

@ -9451,7 +9451,9 @@ void P_MobjThinker(mobj_t *mobj)
mobj->eflags &= ~(MFE_PUSHED|MFE_SPRUNG|MFE_JUSTBOUNCEDWALL|MFE_DAMAGEHITLAG|MFE_SLOPELAUNCHED); mobj->eflags &= ~(MFE_PUSHED|MFE_SPRUNG|MFE_JUSTBOUNCEDWALL|MFE_DAMAGEHITLAG|MFE_SLOPELAUNCHED);
tm.floorthing = tm.hitthing = NULL; // sal: what the hell? is there any reason this isn't done, like, literally ANYWHERE else?
P_SetTarget(&tm.floorthing, NULL);
P_SetTarget(&tm.hitthing, NULL);
// Sector flag MSF_TRIGGERLINE_MOBJ allows ANY mobj to trigger a linedef exec // Sector flag MSF_TRIGGERLINE_MOBJ allows ANY mobj to trigger a linedef exec
P_CheckMobjTrigger(mobj, false); P_CheckMobjTrigger(mobj, false);