summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-10 11:03:22 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-10 11:03:22 +0200
commit314bb83b9aa2f801f11fa5445e86f0e896484138 (patch)
treeff473a02699db190a74a1112ade483cbc31ec283 /src/control
parentFixing mixed IsCutsceneProcessing and IsRunning (diff)
downloadre3-314bb83b9aa2f801f11fa5445e86f0e896484138.tar
re3-314bb83b9aa2f801f11fa5445e86f0e896484138.tar.gz
re3-314bb83b9aa2f801f11fa5445e86f0e896484138.tar.bz2
re3-314bb83b9aa2f801f11fa5445e86f0e896484138.tar.lz
re3-314bb83b9aa2f801f11fa5445e86f0e896484138.tar.xz
re3-314bb83b9aa2f801f11fa5445e86f0e896484138.tar.zst
re3-314bb83b9aa2f801f11fa5445e86f0e896484138.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Script.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index b7876172..ff89f0fc 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -11373,15 +11373,15 @@ void CTheScripts::ClearSpaceForMissionEntity(const CVector& pos, CEntity* pEntit
continue;
CEntity* pFound = aEntities[i];
int cols;
- if (CModelInfo::GetModelInfo(pEntity->GetModelIndex())->GetColModel()->numLines <= 0)
- cols = CCollision::ProcessColModels(pEntity->GetMatrix(), *CModelInfo::GetModelInfo(pEntity->GetModelIndex())->GetColModel(),
- pFound->GetMatrix(), *CModelInfo::GetModelInfo(pFound->GetModelIndex())->GetColModel(), aTempColPoints, nil, nil);
+ if (pEntity->GetColModel()->numLines <= 0)
+ cols = CCollision::ProcessColModels(pEntity->GetMatrix(), *pEntity->GetColModel(),
+ pFound->GetMatrix(), *pFound->GetColModel(), aTempColPoints, nil, nil);
else {
float lines[4];
lines[0] = lines[1] = lines[2] = lines[3] = 1.0f;
- CColPoint tmp;
- cols = CCollision::ProcessColModels(pEntity->GetMatrix(), *CModelInfo::GetModelInfo(pEntity->GetModelIndex())->GetColModel(),
- pFound->GetMatrix(), *CModelInfo::GetModelInfo(pFound->GetModelIndex())->GetColModel(), aTempColPoints, &tmp, lines);
+ CColPoint tmp[4];
+ cols = CCollision::ProcessColModels(pEntity->GetMatrix(), *pEntity->GetColModel(),
+ pFound->GetMatrix(), *pFound->GetColModel(), aTempColPoints,tmp, lines);
}
if (cols <= 0)
continue;