diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:14:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-05 17:14:13 +0300 |
| commit | dfe0642195bd17704aaac669908c8bb29fbcb531 (patch) | |
| tree | 99f4d7dec983e7ad6f4071cc259c8c0de2eda2e2 /src/control/CarCtrl.cpp | |
| parent | fcd386f55d54b84a22540c106ba53f60b7c9b5f5 (diff) | |
| parent | ee261c996b6864ad65f086d97cdb47469c10a651 (diff) | |
Merge pull request #512 from Nick007J/master
MIAMI CAutoPilot + CCarAI + multiple fixes
Diffstat (limited to 'src/control/CarCtrl.cpp')
| -rw-r--r-- | src/control/CarCtrl.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp index 7e772162..927a0070 100644 --- a/src/control/CarCtrl.cpp +++ b/src/control/CarCtrl.cpp @@ -531,7 +531,7 @@ CCarCtrl::GenerateOneRandomCar() pVehicleModel->AvoidSameVehicleColour(&pCar->m_currentColour1, &pCar->m_currentColour2); CWorld::Add(pCar); if (carClass == COPS) - CCarAI::AddPoliceOccupants(pCar); + CCarAI::AddPoliceCarOccupants(pCar); else pCar->SetUpDriver(); if ((CGeneral::GetRandomNumber() & 0x3F) == 0){ /* 1/64 probability */ @@ -2751,3 +2751,15 @@ bool CCarCtrl::MapCouldMoveInThisArea(float x, float y) return false; #endif } + +#ifdef MIAMI +float CCarCtrl::FindSpeedMultiplierWithSpeedFromNodes(int8 type) +{ + switch (type) + { + case 1: return 1.5f; + case 2: return 2.0f; + } + return 1.0f; +} +#endif |