diff options
| author | aap <aap@papnet.eu> | 2020-05-06 17:56:38 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-06 17:56:38 +0200 |
| commit | f1c1f56b1268b900a01a479f9ad67cd92e63eb52 (patch) | |
| tree | f936f78ebcc7b736995b68b4d65a66c26cc790c2 /src/control | |
| parent | Merge remote-tracking branch 'origin/master' into miami (diff) | |
| download | re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.tar re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.tar.gz re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.tar.bz2 re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.tar.lz re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.tar.xz re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.tar.zst re3-f1c1f56b1268b900a01a479f9ad67cd92e63eb52.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/CarCtrl.cpp | 2 | ||||
| -rw-r--r-- | src/control/PathFind.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp index 6a5d37f3..5dfb73d0 100644 --- a/src/control/CarCtrl.cpp +++ b/src/control/CarCtrl.cpp @@ -354,7 +354,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; |