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

Guard with mobj??

Browse source
This commit is contained in:
James R 2020-10-15 04:30:48 -07:00
parent 75b3fffc04
commit 1db22403bb
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/p_maputl.c
View file

@ -430,6 +430,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
enum { FRONT, BACK };
sector_t *front, *back;
fixed_t thingtop = 0;
vertex_t cross;
/* these init to shut compiler up */
@ -460,6 +461,11 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
I_Assert(front != NULL);
I_Assert(back != NULL);
if (mobj)
{
thingtop = mobj->z + mobj->height;
}
openfloorrover = openceilingrover = NULL;
if (linedef->polyobj)
{
@ -490,13 +496,16 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
highceiling = height[high];
opentopslope = sector[low]->c_slope;
openceilingdiff = ( mobj->z + mobj->height -
P_GetSectorCeilingZAt(sector[low], cross.x, cross.y) );
if (mobj)
{
openceilingdiff = ( thingtop -
P_GetSectorCeilingZAt(sector[low], cross.x, cross.y) );
topedge[FRONT] = P_GetSectorCeilingZAt(front, cross.x, cross.y);
topedge[BACK] = P_GetSectorCeilingZAt(back, cross.x, cross.y);
topedge[FRONT] = P_GetSectorCeilingZAt(front, cross.x, cross.y);
topedge[BACK] = P_GetSectorCeilingZAt(back, cross.x, cross.y);
openceilingdrop = ( topedge[high] - topedge[low] );
openceilingdrop = ( topedge[high] - topedge[low] );
}
height[FRONT] = P_GetFloorZ(mobj, front, tmx, tmy, linedef);
height[BACK] = P_GetFloorZ(mobj, back, tmx, tmy, linedef);
@ -507,21 +516,22 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
lowfloor = height[low];
openbottomslope = sector[high]->f_slope;
openfloordiff =
( P_GetSectorFloorZAt(sector[high], cross.x, cross.y) - mobj->z );
if (mobj)
{
openfloordiff =
( P_GetSectorFloorZAt(sector[high], cross.x, cross.y) - mobj->z );
botedge[FRONT] = P_GetSectorFloorZAt(front, cross.x, cross.y);
botedge[BACK] = P_GetSectorFloorZAt(back, cross.x, cross.y);
botedge[FRONT] = P_GetSectorFloorZAt(front, cross.x, cross.y);
botedge[BACK] = P_GetSectorFloorZAt(back, cross.x, cross.y);
openfloordrop = ( botedge[high] - botedge[low] );
openfloordrop = ( botedge[high] - botedge[low] );
}
#undef low
}
if (mobj)
{
fixed_t thingtop = mobj->z + mobj->height;
// Check for collision with front side's midtexture if Effect 4 is set
if (linedef->flags & ML_EFFECT4
&& !linedef->polyobj // don't do anything for polyobjects! ...for now