stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-22 19:02:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix P_PlayerCanEnterGaps issues with polyobject collision

Browse source
This commit is contained in:
lachablock 2021-03-25 15:25:35 +11:00
parent f99d89742a
commit b1a9262889
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/p_map.c
View file

@ -1955,12 +1955,6 @@ static boolean PIT_CheckLine(line_t *ld)
// set openrange, opentop, openbottom
P_LineOpening(ld, tmthing);
// players should not always cross into sectors that they could not at full height
if (tmthing->player
&& openrange < P_GetPlayerHeight(tmthing->player)
&& !P_PlayerCanEnterSpinGaps(tmthing->player))
return false;
// adjust floor / ceiling heights
if (opentop < tmceilingz)
{
@ -2729,7 +2723,10 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
if (thing->type == MT_SKIM)
maxstep = 0;
if (tmceilingz - tmfloorz < thing->height)
if (tmceilingz - tmfloorz < thing->height
|| (thing->player
&& tmceilingz - tmfloorz < P_GetPlayerHeight(thing->player)
&& !P_PlayerCanEnterSpinGaps(thing->player)))
{
if (tmfloorthing)
tmhitthing = tmfloorthing;