diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-11 09:36:58 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-11 09:36:58 +0300 |
| commit | 2c79080e1b16cb794b33e24508c11ab4fc259b48 (patch) | |
| tree | 9f602753c501bd1524179753beeb52771f43e924 /src/vehicles/CarGen.cpp | |
| parent | e042ba6f24aa39bd4b29b7abd0c3899680f3d235 (diff) | |
| parent | 75f812cfcd08cddcd01cf58e9fa59d7844cb42c8 (diff) | |
Merge branch 'miami' into lcs
# Conflicts:
# src/core/Radar.cpp
# src/core/Radar.h
Diffstat (limited to 'src/vehicles/CarGen.cpp')
| -rw-r--r-- | src/vehicles/CarGen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vehicles/CarGen.cpp b/src/vehicles/CarGen.cpp index 29d0c5c7..bce8cdab 100644 --- a/src/vehicles/CarGen.cpp +++ b/src/vehicles/CarGen.cpp @@ -202,7 +202,7 @@ bool CCarGenerator::CheckForBlockage(int32 mi) { int16 entities; CEntity* pEntities[8]; - CColModel* pColModel = CModelInfo::GetModelInfo(mi)->GetColModel(); + CColModel* pColModel = CModelInfo::GetColModel(mi); CWorld::FindObjectsKindaColliding(CVector(m_vecPos), pColModel->boundingSphere.radius, 1, &entities, 8, pEntities, false, true, true, false, false); for (int i = 0; i < entities; i++) { if (m_vecPos.z + pColModel->boundingBox.min.z < pEntities[i]->GetPosition().z + pEntities[i]->GetColModel()->boundingBox.max.z + 1.0f && |