zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-18 23:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect HitTexture reassignment in LineTrace.

Browse source
This commit is contained in:
Marisa Kirisame 2018-01-28 14:23:50 +01:00 committed by Christoph Oelckers
parent 5d223bb8c3
commit bc4a8190bf
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/p_map.cpp
View file

@ -4902,17 +4902,8 @@ 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;
switch ( trace.HitType ) 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; outdata->LineSide = trace.Side;
int txpart; int txpart;
switch ( trace.Tier ) switch ( trace.Tier )
@ -4934,9 +4925,8 @@ bool P_LineTrace(AActor *t1, DAngle angle, double distance,
outdata->HitTexture = trace.ffloor->master->sidedef[0]->textures[txpart].texture; outdata->HitTexture = trace.ffloor->master->sidedef[0]->textures[txpart].texture;
break; break;
} }
default:
break;
} }
else outdata->HitTexture = trace.HitTexture;
outdata->HitLocation = trace.HitPos; outdata->HitLocation = trace.HitPos;
outdata->Distance = trace.Distance; outdata->Distance = trace.Distance;
outdata->NumPortals = TData.NumPortals; outdata->NumPortals = TData.NumPortals;