summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-06 18:04:52 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-06 18:04:52 +0200
commitd5e76471ae48bd3a31edb987d1c5366e7a67b3e2 (patch)
tree07a8ff3df033c62c58b6d27dfb94227e92b384c9 /src/control
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
parentCSphere and CBox for CColModel (diff)
downloadre3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar
re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.gz
re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.bz2
re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.lz
re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.xz
re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.zst
re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/CarCtrl.cpp2
-rw-r--r--src/control/PathFind.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 6eac44df..a4769d56 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -356,7 +356,7 @@ CCarCtrl::GenerateOneRandomCar()
pCar->m_bSirenOrAlarm = true;
pCar->AutoPilot.m_nNextPathNodeInfo = connectionId;
pCar->AutoPilot.m_nNextLane = pCar->AutoPilot.m_nCurrentLane = CGeneral::GetRandomNumber() % lanesOnCurrentRoad;
- CColBox* boundingBox = &CModelInfo::GetModelInfo(pCar->GetModelIndex())->GetColModel()->boundingBox;
+ CBox* boundingBox = &CModelInfo::GetModelInfo(pCar->GetModelIndex())->GetColModel()->boundingBox;
float carLength = 1.0f + (boundingBox->max.y - boundingBox->min.y) / 2;
float distanceBetweenNodes = (pCurNode->GetPosition() - pNextNode->GetPosition()).Magnitude2D();
/* If car is so long that it doesn't fit between two car nodes, place it directly in the middle. */
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index a5493a8f..22221e73 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -197,7 +197,7 @@ CPedPath::AddBlockadeSectorList(CPtrList& list, CPedPathNode(*pathNodes)[40], CV
void
CPedPath::AddBlockade(CEntity *pEntity, CPedPathNode(*pathNodes)[40], CVector *pPosition)
{
- const CColBox& boundingBox = pEntity->GetColModel()->boundingBox;
+ const CBox& boundingBox = pEntity->GetColModel()->boundingBox;
const float fBoundMaxY = boundingBox.max.y + 0.3f;
const float fBoundMinY = boundingBox.min.y - 0.3f;
const float fBoundMaxX = boundingBox.max.x + 0.3f;