summaryrefslogtreecommitdiffstats
path: root/src/core/World.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-08-09 17:14:19 +0200
committerSergeanur <s.anureev@yandex.ua>2021-08-09 17:14:19 +0200
commit1f98f01dcb006783755bd58fa458bb515626b2dd (patch)
treea9c26a33b0ae98f19c48a151ae5910422e18816f /src/core/World.cpp
parentAdd sprite to the waypoint marker (diff)
downloadre3-1f98f01dcb006783755bd58fa458bb515626b2dd.tar
re3-1f98f01dcb006783755bd58fa458bb515626b2dd.tar.gz
re3-1f98f01dcb006783755bd58fa458bb515626b2dd.tar.bz2
re3-1f98f01dcb006783755bd58fa458bb515626b2dd.tar.lz
re3-1f98f01dcb006783755bd58fa458bb515626b2dd.tar.xz
re3-1f98f01dcb006783755bd58fa458bb515626b2dd.tar.zst
re3-1f98f01dcb006783755bd58fa458bb515626b2dd.zip
Diffstat (limited to 'src/core/World.cpp')
-rw-r--r--src/core/World.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp
index 6e8314f4..1c34a633 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -358,7 +358,7 @@ CWorld::ProcessLineOfSightSectorList(CPtrList &list, const CColLine &line, CColP
} else
colmodel = nil;
} else if(e->bUsesCollision)
- colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
+ colmodel = CModelInfo::GetColModel(e->GetModelIndex());
if(colmodel && CCollision::ProcessLineOfSight(line, e->GetMatrix(), *colmodel, point, mindist,
ignoreSeeThrough))
@@ -444,7 +444,7 @@ CWorld::ProcessVerticalLineSectorList(CPtrList &list, const CColLine &line, CCol
if(e->m_scanCode != GetCurrentScanCode() && e->bUsesCollision) {
e->m_scanCode = GetCurrentScanCode();
- colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
+ colmodel = CModelInfo::GetColModel(e->GetModelIndex());
if(CCollision::ProcessVerticalLine(line, e->GetMatrix(), *colmodel, point, mindist,
ignoreSeeThrough, poly))
entity = e;
@@ -645,7 +645,7 @@ CWorld::GetIsLineOfSightSectorListClear(CPtrList &list, const CColLine &line, bo
if(e != pIgnoreEntity && !(ignoreSomeObjects && CameraToIgnoreThisObject(e))) {
- colmodel = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
+ colmodel = CModelInfo::GetColModel(e->GetModelIndex());
if(CCollision::TestLineOfSight(line, e->GetMatrix(), *colmodel, ignoreSeeThrough))
return false;
@@ -955,7 +955,7 @@ CWorld::TestSphereAgainstSectorList(CPtrList &list, CVector spherePos, float rad
float distance = diff.Magnitude();
if(e->GetBoundRadius() + radius > distance) {
- CColModel *eCol = CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel();
+ CColModel *eCol = CModelInfo::GetColModel(e->GetModelIndex());
int collidedSpheres =
CCollision::ProcessColModels(sphereMat, OurColModel, e->GetMatrix(), *eCol,
gaTempSphereColPoints, nil, nil);