zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-03-17 08:21:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'refs/pull/416/head' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2018-01-28 14:43:35 -05:00
commit e094a04073
3 changed files with 6 additions and 12 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;
FTextureID HitTexture;
DVector3 HitLocation;
DVector3 HitDir;
double Distance;
int NumPortals;
int LineSide;

16
src/p_map.cpp
View file

@ -4898,17 +4898,9 @@ bool P_LineTrace(AActor *t1, DAngle angle, double distance,
outdata->HitLine = trace.Line;
outdata->HitSector = trace.Sector;
outdata->Hit3DFloor = trace.ffloor;
switch ( trace.HitType )
outdata->SectorPlane = (trace.HitType == TRACE_HitCeiling) ? 1 : 0;
if ( trace.HitType == TRACE_HitWall )
{
case TRACE_HitFloor:
outdata->SectorPlane = 0;
outdata->HitTexture = trace.Sector->planes[0].Texture;
break;
case TRACE_HitCeiling:
outdata->SectorPlane = 1;
outdata->HitTexture = trace.Sector->planes[1].Texture;
break;
case TRACE_HitWall:
outdata->LineSide = trace.Side;
int txpart;
switch ( trace.Tier )
@ -4930,10 +4922,10 @@ bool P_LineTrace(AActor *t1, DAngle angle, double distance,
outdata->HitTexture = trace.ffloor->master->sidedef[0]->textures[txpart].texture;
break;
}
default:
break;
}
else outdata->HitTexture = trace.HitTexture;
outdata->HitLocation = trace.HitPos;
outdata->HitDir = trace.HitVector;
outdata->Distance = trace.Distance;
outdata->NumPortals = TData.NumPortals;
outdata->HitType = trace.HitType;

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

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