zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 20:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed return conditions of Trace() so that it always returns something valid. Due to the portal related changes the default initialization for TRACE_HitNone must be inside TraceTraverse.

Browse source
This commit is contained in:
Christoph Oelckers 2016-03-06 01:41:52 +01:00
parent ae4cc9669b
commit 74592334e4
1 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/p_trace.cpp
View file

@ -141,22 +141,17 @@ bool Trace (fixed_t x, fixed_t y, fixed_t z, sector_t *sector,
inf.aimdir = -1; inf.aimdir = -1;
inf.startfrac = 0; inf.startfrac = 0;
memset(&res, 0, sizeof(res)); memset(&res, 0, sizeof(res));
/* // Redundant with the memset
res.HitType = TRACE_HitNone;
res.CrossedWater = NULL;
res.Crossed3DWater = NULL;
*/
// check for overflows and clip if necessary // check for overflows and clip if necessary
SQWORD xd = (SQWORD)x + ((SQWORD(vx) * SQWORD(maxDist)) >> 16); SQWORD xd = (SQWORD)x + ((SQWORD(vx) * SQWORD(maxDist)) >> 16);
if (xd>SQWORD(32767)*FRACUNIT) if (xd>SQWORD(32767)*FRACUNIT)
{ {
maxDist = inf.MaxDist = FixedDiv(FIXED_MAX - x, vx); inf.MaxDist = FixedDiv(FIXED_MAX - x, vx);
} }
else if (xd<-SQWORD(32767)*FRACUNIT) else if (xd<-SQWORD(32767)*FRACUNIT)
{ {
maxDist = inf.MaxDist = FixedDiv(FIXED_MIN - x, vx); inf.MaxDist = FixedDiv(FIXED_MIN - x, vx);
} }
@ -164,32 +159,19 @@ bool Trace (fixed_t x, fixed_t y, fixed_t z, sector_t *sector,
if (yd>SQWORD(32767)*FRACUNIT) if (yd>SQWORD(32767)*FRACUNIT)
{ {
maxDist = inf.MaxDist = FixedDiv(FIXED_MAX - y, vy); inf.MaxDist = FixedDiv(FIXED_MAX - y, vy);
} }
else if (yd<-SQWORD(32767)*FRACUNIT) else if (yd<-SQWORD(32767)*FRACUNIT)
{ {
maxDist = inf.MaxDist = FixedDiv(FIXED_MIN - y, vy); inf.MaxDist = FixedDiv(FIXED_MIN - y, vy);
} }
if (inf.TraceTraverse (ptflags)) if (inf.TraceTraverse (ptflags))
{ {
if (flags) return flags ? EditTraceResult(flags, res) : true;
{
return EditTraceResult(flags, res);
}
else
{
return true;
}
} }
else else
{ {
res.HitType = TRACE_HitNone;
res.X = x + FixedMul (vx, maxDist);
res.Y = y + FixedMul (vy, maxDist);
res.Z = z + FixedMul (vz, maxDist);
res.Distance = maxDist;
res.Fraction = FRACUNIT;
return false; return false;
} }
} }
@ -909,8 +891,15 @@ bool FTraceInfo::TraceTraverse (int ptflags)
} }
Results = res; Results = res;
} }
if (Results->HitType == TRACE_HitNone && Results->Distance == 0)
return true; {
Results->X = StartX + FixedMul(Vx, MaxDist);
Results->Y = StartY + FixedMul(Vy, MaxDist);
Results->Z = StartZ + FixedMul(Vz, MaxDist);
Results->Distance = MaxDist;
Results->Fraction = FRACUNIT;
}
return Results->HitType != TRACE_HitNone;
} }
//========================================================================== //==========================================================================