a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-22 19:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Use previous naming & fix LineOfSightSectorList too

Browse source
This commit is contained in:
erorcun 2021-01-28 03:49:50 +03:00
parent a74f597d45
commit 2d0562412e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/World.cpp
View file

@ -360,7 +360,7 @@ CWorld::ProcessLineOfSightSectorList(CPtrList &list, const CColLine &line, CColP
} else if(e->bUsesCollision) } else if(e->bUsesCollision)
colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel(); colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
if(colmodel && CCollision::ProcessLineOfSight(line, e->GetMatrix(), *colmodel, point, dist, if(colmodel && CCollision::ProcessLineOfSight(line, e->GetMatrix(), *colmodel, point, mindist,
ignoreSeeThrough)) ignoreSeeThrough))
entity = e; entity = e;
} }
@ -431,10 +431,10 @@ CWorld::ProcessVerticalLineSector(CSector &sector, const CColLine &line, CColPoi
} }
bool bool
CWorld::ProcessVerticalLineSectorList(CPtrList &list, const CColLine &line, CColPoint &point, float &mindist, CWorld::ProcessVerticalLineSectorList(CPtrList &list, const CColLine &line, CColPoint &point, float &dist,
CEntity *&entity, bool ignoreSeeThrough, CStoredCollPoly *poly) CEntity *&entity, bool ignoreSeeThrough, CStoredCollPoly *poly)
{ {
float dist = mindist; float mindist = dist;
CPtrNode *node; CPtrNode *node;
CEntity *e; CEntity *e;
CColModel *colmodel; CColModel *colmodel;
@ -445,14 +445,14 @@ CWorld::ProcessVerticalLineSectorList(CPtrList &list, const CColLine &line, CCol
e->m_scanCode = GetCurrentScanCode(); e->m_scanCode = GetCurrentScanCode();
colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel(); colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
if(CCollision::ProcessVerticalLine(line, e->GetMatrix(), *colmodel, point, dist, if(CCollision::ProcessVerticalLine(line, e->GetMatrix(), *colmodel, point, mindist,
ignoreSeeThrough, poly)) ignoreSeeThrough, poly))
entity = e; entity = e;
} }
} }
if(dist < mindist) { if(mindist < dist) {
mindist = dist; dist = mindist;
return true; return true;
} else } else
return false; return false;