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

Battle UFO: do not suck player who is spinning out

Browse source
This commit is contained in:
James R 2024-01-16 02:18:29 -08:00
parent ecf70c6eea
commit 54e4dd5cd8
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_map.c
View file

@ -781,7 +781,7 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
if (thing->type == MT_BATTLEUFO) if (thing->type == MT_BATTLEUFO)
{ {
if (tm.thing->type != MT_PLAYER) if (!tm.thing->player)
{ {
return BMIT_CONTINUE; // not a player return BMIT_CONTINUE; // not a player
} }
@ -801,7 +801,12 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
return BMIT_CONTINUE; // underneath return BMIT_CONTINUE; // underneath
} }
if (!tm.thing->player || !tm.thing->player->fastfall) if (P_PlayerInPain(tm.thing->player))
{
return BMIT_CONTINUE; // spinout would cause a softlock
}
if (!tm.thing->player->fastfall)
{ {
fixed_t tractorHeight = 211*mapobjectscale; fixed_t tractorHeight = 211*mapobjectscale;
fixed_t zRange = FixedDiv(thing->z - tm.thing->z, tractorHeight); fixed_t zRange = FixedDiv(thing->z - tm.thing->z, tractorHeight);