zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-31 13:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix accidentally removed SectorPlane assignment. Added missing HitVector support.

Browse source
This commit is contained in:
Marisa Kirisame 2018-01-28 17:45:36 +01:00 committed by Christoph Oelckers
parent bc4a8190bf
commit 069c5aa90a
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p_linetracedata.h
View file

@ -14,6 +14,7 @@ struct FLineTraceData
F3DFloor *Hit3DFloor; F3DFloor *Hit3DFloor;
FTextureID HitTexture; FTextureID HitTexture;
DVector3 HitLocation; DVector3 HitLocation;
DVector3 HitDir;
double Distance; double Distance;
int NumPortals; int NumPortals;
int LineSide; int LineSide;

2
src/p_map.cpp
View file

@ -4902,6 +4902,7 @@ bool P_LineTrace(AActor *t1, DAngle angle, double distance,
outdata->HitLine = trace.Line; outdata->HitLine = trace.Line;
outdata->HitSector = trace.Sector; outdata->HitSector = trace.Sector;
outdata->Hit3DFloor = trace.ffloor; outdata->Hit3DFloor = trace.ffloor;
outdata->SectorPlane = (trace.HitType == TRACE_HitCeiling) ? 1 : 0;
if ( trace.HitType == TRACE_HitWall ) if ( trace.HitType == TRACE_HitWall )
{ {
outdata->LineSide = trace.Side; outdata->LineSide = trace.Side;
@ -4928,6 +4929,7 @@ bool P_LineTrace(AActor *t1, DAngle angle, double distance,
} }
else outdata->HitTexture = trace.HitTexture; else outdata->HitTexture = trace.HitTexture;
outdata->HitLocation = trace.HitPos; outdata->HitLocation = trace.HitPos;
outdata->HitDir = trace.HitVector;
outdata->Distance = trace.Distance; outdata->Distance = trace.Distance;
outdata->NumPortals = TData.NumPortals; outdata->NumPortals = TData.NumPortals;
outdata->HitType = trace.HitType; outdata->HitType = trace.HitType;

1
wadsrc/static/zscript/actor.txt
View file

@ -47,6 +47,7 @@ struct FLineTraceData
F3DFloor Hit3DFloor; F3DFloor Hit3DFloor;
TextureID HitTexture; TextureID HitTexture;
Vector3 HitLocation; Vector3 HitLocation;
Vector3 HitDir;
double Distance; double Distance;
int NumPortals; int NumPortals;
int LineSide; int LineSide;