zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-13 07:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed level references in p_trace.cpp. Also added a null check to the sector pointer of the LineTracer Trace function because a null pointer here would crash.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-28 22:19:09 +01:00
parent 6312c44234
commit befacddab4
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/p_trace.cpp
View file

@ -50,6 +50,7 @@
struct FTraceInfo struct FTraceInfo
{ {
FLevelLocals *Level;
DVector3 Start; DVector3 Start;
DVector3 Vec; DVector3 Vec;
ActorFlags ActorMask; ActorFlags ActorMask;
@ -158,6 +159,7 @@ bool Trace(const DVector3 &start, sector_t *sector, const DVector3 &direction, d
memset(&tempResult, 0, sizeof(tempResult)); memset(&tempResult, 0, sizeof(tempResult));
tempResult.Fraction = tempResult.Distance = NO_VALUE; tempResult.Fraction = tempResult.Distance = NO_VALUE;
inf.Level = sector->Level;
inf.Start = start; inf.Start = start;
GetPortalTransition(inf.Start, sector); GetPortalTransition(inf.Start, sector);
inf.ptflags = actorMask ? PT_ADDLINES|PT_ADDTHINGS|PT_COMPATIBLE : PT_ADDLINES; inf.ptflags = actorMask ? PT_ADDLINES|PT_ADDTHINGS|PT_COMPATIBLE : PT_ADDLINES;
@ -452,7 +454,7 @@ bool FTraceInfo::LineCheck(intercept_t *in, double dist, DVector3 hit, bool spec
// hit crossed a water plane // hit crossed a water plane
if (CheckSectorPlane(hsec, true)) if (CheckSectorPlane(hsec, true))
{ {
Results->CrossedWater = &level.sectors[CurSector->sectornum]; Results->CrossedWater = &Level->sectors[CurSector->sectornum];
Results->CrossedWaterPos = Results->HitPos; Results->CrossedWaterPos = Results->HitPos;
Results->Distance = 0; Results->Distance = 0;
} }
@ -583,7 +585,7 @@ cont:
if (Results->HitType != TRACE_HitNone) if (Results->HitType != TRACE_HitNone)
{ {
// We hit something, so figure out where exactly // We hit something, so figure out where exactly
Results->Sector = &level.sectors[CurSector->sectornum]; Results->Sector = &Level->sectors[CurSector->sectornum];
if (Results->HitType != TRACE_HitWall && if (Results->HitType != TRACE_HitWall &&
!CheckSectorPlane(CurSector, Results->HitType == TRACE_HitFloor)) !CheckSectorPlane(CurSector, Results->HitType == TRACE_HitFloor))
@ -720,7 +722,7 @@ bool FTraceInfo::ThingCheck(intercept_t *in, double dist, DVector3 hit)
// the trace hit a 3D floor before the thing. // the trace hit a 3D floor before the thing.
// Calculate an intersection and abort. // Calculate an intersection and abort.
Results->Sector = &level.sectors[CurSector->sectornum]; Results->Sector = &Level->sectors[CurSector->sectornum];
if (!CheckSectorPlane(CurSector, Results->HitType == TRACE_HitFloor)) if (!CheckSectorPlane(CurSector, Results->HitType == TRACE_HitFloor))
{ {
Results->HitType = TRACE_HitNone; Results->HitType = TRACE_HitNone;
@ -872,7 +874,7 @@ bool FTraceInfo::TraceTraverse (int ptflags)
} }
// check for intersection with floor/ceiling // check for intersection with floor/ceiling
Results->Sector = &level.sectors[CurSector->sectornum]; Results->Sector = &Level->sectors[CurSector->sectornum];
if (Results->CrossedWater == NULL && if (Results->CrossedWater == NULL &&
CurSector->heightsec != NULL && CurSector->heightsec != NULL &&
@ -886,7 +888,7 @@ bool FTraceInfo::TraceTraverse (int ptflags)
if (CheckSectorPlane(CurSector->heightsec, true)) if (CheckSectorPlane(CurSector->heightsec, true))
{ {
Results->CrossedWater = &level.sectors[CurSector->sectornum]; Results->CrossedWater = &Level->sectors[CurSector->sectornum];
Results->CrossedWaterPos = Results->HitPos; Results->CrossedWaterPos = Results->HitPos;
Results->Distance = 0; Results->Distance = 0;
} }
@ -1020,7 +1022,7 @@ DEFINE_ACTION_FUNCTION(DLineTracer, Trace)
PARAM_FLOAT(start_x); PARAM_FLOAT(start_x);
PARAM_FLOAT(start_y); PARAM_FLOAT(start_y);
PARAM_FLOAT(start_z); PARAM_FLOAT(start_z);
PARAM_POINTER(sector, sector_t); PARAM_POINTER_NOT_NULL(sector, sector_t);
PARAM_FLOAT(direction_x); PARAM_FLOAT(direction_x);
PARAM_FLOAT(direction_y); PARAM_FLOAT(direction_y);
PARAM_FLOAT(direction_z); PARAM_FLOAT(direction_z);