summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-10 11:04:17 +0200
committerGitHub <noreply@github.com>2020-04-10 11:04:17 +0200
commit6b9aadc021db9b62b8a966202b91accd278c8b0c (patch)
tree988873b074771f3b69bed031942694306fbd0cec /src
parentPlayerSkin small cleanup (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-6b9aadc021db9b62b8a966202b91accd278c8b0c.tar
re3-6b9aadc021db9b62b8a966202b91accd278c8b0c.tar.gz
re3-6b9aadc021db9b62b8a966202b91accd278c8b0c.tar.bz2
re3-6b9aadc021db9b62b8a966202b91accd278c8b0c.tar.lz
re3-6b9aadc021db9b62b8a966202b91accd278c8b0c.tar.xz
re3-6b9aadc021db9b62b8a966202b91accd278c8b0c.tar.zst
re3-6b9aadc021db9b62b8a966202b91accd278c8b0c.zip
Diffstat (limited to 'src')
-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;