OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Moved the PointInSector functions into FLevelLocals

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-29 01:30:41 +01:00
commit 60873bc5d6
38 changed files with 167 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/p_trace.cpp
View file

@ -117,7 +117,7 @@ static void GetPortalTransition(DVector3 &pos, sector_t *&sec)
if (pos.Z > sec->GetPortalPlaneZ(sector_t::ceiling))
{
pos += sec->GetPortalDisplacement(sector_t::ceiling);
sec = P_PointInSector(pos);
sec = sec->Level->PointInSector(pos);
moved = true;
}
else break;
@ -129,7 +129,7 @@ static void GetPortalTransition(DVector3 &pos, sector_t *&sec)
if (pos.Z <= sec->GetPortalPlaneZ(sector_t::floor))
{
pos += sec->GetPortalDisplacement(sector_t::floor);
sec = P_PointInSector(pos);
sec = sec->Level->PointInSector(pos);
}
else break;
}
@ -222,7 +222,7 @@ void FTraceInfo::EnterSectorPortal(FPathTraverse &pt, int position, double frac,
DVector3 enter = exit + displacement;
Start += displacement;
CurSector = P_PointInSector(enter);
CurSector = entersec->Level->PointInSector(enter);
inshootthrough = true;
startfrac = frac;
EnterDist = enterdist;
@ -261,7 +261,7 @@ void FTraceInfo::EnterLinePortal(FPathTraverse &pt, intercept_t *in)
P_TranslatePortalVXVY(li, Vec.X, Vec.Y);
P_TranslatePortalZ(li, limitz);
CurSector = P_PointInSector(Start + enterdist * Vec);
CurSector = li->GetLevel()->PointInSector(Start + enterdist * Vec);
EnterDist = enterdist;
inshootthrough = true;
startfrac = frac;
@ -1085,4 +1085,4 @@ ETraceStatus DLineTracer::CallZScriptCallback()
}
return TRACE_Stop;
}
}