thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'noclip-isnt-noclipthing' into special-stages

Browse source
This commit is contained in:
Sally Coolatta 2022-12-19 04:45:51 -05:00
commit b0598c2182
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/p_map.c
View file

@ -2139,9 +2139,6 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y, TryMoveResult_t *re
// reset special lines // reset special lines
numspechit = 0U; numspechit = 0U;
if (tm.flags & MF_NOCLIP)
return true;
// Check things first, possibly picking things up. // Check things first, possibly picking things up.
// MF_NOCLIPTHING: used by camera to not be blocked by things // MF_NOCLIPTHING: used by camera to not be blocked by things
@ -2168,6 +2165,15 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y, TryMoveResult_t *re
} }
} }
if (tm.flags & MF_NOCLIP)
{
// Sal 12/19/2022 -- PIT_CheckThing code will still run
// with MF_NOCLIP enabled, but they won't be blocked
// regardless of the result. This allows for SPBs and
// the UFO to collide.
return true;
}
validcount++; validcount++;
// check lines // check lines
@ -2636,7 +2642,10 @@ increment_move
radius = min(radius, 16*mapobjectscale); radius = min(radius, 16*mapobjectscale);
do { do {
if (thing->flags & MF_NOCLIP) // Sal 12/19/2022 -- PIT_CheckThing code now runs
// with MF_NOCLIP enabled, so we want step-by-step
// for anything that doesn't have both enabled.
if ((thing->flags & (MF_NOCLIP|MF_NOCLIPTHING)) == (MF_NOCLIP|MF_NOCLIPTHING))
{ {
tryx = x; tryx = x;
tryy = y; tryy = y;