diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/animation/CutsceneMgr.cpp | 4 | ||||
| -rw-r--r-- | src/peds/Population.cpp | 9 | ||||
| -rw-r--r-- | src/vehicles/HandlingMgr.cpp | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/animation/CutsceneMgr.cpp b/src/animation/CutsceneMgr.cpp index b312236b..003385da 100644 --- a/src/animation/CutsceneMgr.cpp +++ b/src/animation/CutsceneMgr.cpp @@ -633,8 +633,8 @@ CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver() CStreaming::RemoveCurrentZonesModels(); CStreaming::SetModelIsDeletable(MI_MALE01); CStreaming::SetModelTxdIsDeletable(MI_MALE01); - CStreaming::SetModelIsDeletable(MI_HMOCA); - CStreaming::SetModelTxdIsDeletable(MI_HMOCA); + CStreaming::SetModelIsDeletable(MI_TAXI_D); + CStreaming::SetModelTxdIsDeletable(MI_TAXI_D); CStreaming::SetModelIsDeletable(MI_NIGHTSTICK); CStreaming::SetModelTxdIsDeletable(MI_NIGHTSTICK); CStreaming::SetModelIsDeletable(MI_MISSILE); diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp index 7314080b..f886597f 100644 --- a/src/peds/Population.cpp +++ b/src/peds/Population.cpp @@ -558,11 +558,8 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree // Taxi side mission if (CTheScripts::IsPlayerOnAMission()) { CPed *player = FindPlayerPed(); - if (player && player->InVehicle()) { - int32 model = player->m_pMyVehicle->GetModelIndex(); - if (model == MI_TAXI || model == MI_CABBIE || model == MI_ZEBRA || model == MI_KAUFMAN) - missionAndWeatherMult = 1.0f; - } + if (player && player->InVehicle() && player->m_pMyVehicle->IsTaxi()) + missionAndWeatherMult = 1.0f; } if (CDarkel::FrenzyOnGoing()) missionAndWeatherMult = 1.0f; @@ -843,7 +840,7 @@ CPopulation::AddPedInCar(CVehicle* car, bool isDriver) pedType = PEDTYPE_COP; break; default: - if (car->GetModelIndex() == MI_TAXI || car->GetModelIndex() == MI_CABBIE || car->GetModelIndex() == MI_ZEBRA || car->GetModelIndex() == MI_KAUFMAN) { + if (car->IsTaxi()) { if (isDriver) { pedType = PEDTYPE_CIVMALE; preferredModel = MI_TAXI_D; diff --git a/src/vehicles/HandlingMgr.cpp b/src/vehicles/HandlingMgr.cpp index 611ddcc9..9aa834ac 100644 --- a/src/vehicles/HandlingMgr.cpp +++ b/src/vehicles/HandlingMgr.cpp @@ -350,7 +350,7 @@ void cHandlingDataMgr::ConvertDataToGameUnits(tHandlingData *handling) { // convert distance to m, time to 1/50s - float velocity, a, b, specificVolume; + float velocity, a, b; handling->Transmission.fEngineAcceleration *= 1.0f/(50.0f*50.0f); handling->Transmission.fMaxVelocity *= 1000.0f/(60.0f*60.0f * 50.0f); |