diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-18 20:20:44 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-18 20:20:44 +0100 |
| commit | 4f36a1fb770653f26dd4fb3f89a6596015fbb4af (patch) | |
| tree | acefb8b0fb1d2ffbf2136e643d327a54a6b27a01 /src/control/CarCtrl.cpp | |
| parent | Merge remote-tracking branch 'upstream/lcs' into lcs (diff) | |
| download | re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.gz re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.bz2 re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.lz re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.xz re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.tar.zst re3-4f36a1fb770653f26dd4fb3f89a6596015fbb4af.zip | |
Diffstat (limited to 'src/control/CarCtrl.cpp')
| -rw-r--r-- | src/control/CarCtrl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp index faee574c..15cfee11 100644 --- a/src/control/CarCtrl.cpp +++ b/src/control/CarCtrl.cpp @@ -112,6 +112,8 @@ int32 CCarCtrl::LoadedCarsArray[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY]; CVehicle* apCarsToKeep[MAX_CARS_TO_KEEP]; uint32 aCarsToKeepTime[MAX_CARS_TO_KEEP]; +bool gbEmergencyVehiclesEnabled = true; + //--MIAMI: done except heli/plane functions void @@ -3205,7 +3207,7 @@ void CCarCtrl::GenerateEmergencyServicesCar(void) if (NumFiretrucksOnDuty + NumAmbulancesOnDuty + NumParkedCars + NumMissionCars + NumLawEnforcerCars + NumRandomCars > MaxNumberOfCarsInUse) return; - if (NumAmbulancesOnDuty == 0 /* TODO(LCS): && gbEmergencyVehiclesEnabled */){ + if (NumAmbulancesOnDuty == 0 && gbEmergencyVehiclesEnabled){ if (gAccidentManager.CountActiveAccidents() < 2){ if (CStreaming::HasModelLoaded(MI_AMBULAN)) CStreaming::SetModelIsDeletable(MI_MEDIC); @@ -3224,7 +3226,7 @@ void CCarCtrl::GenerateEmergencyServicesCar(void) } } } - if (NumFiretrucksOnDuty == 0 /* TODO(LCS): && gbEmergencyVehiclesEnabled */){ + if (NumFiretrucksOnDuty == 0 && gbEmergencyVehiclesEnabled){ if (gFireManager.GetTotalActiveFires() < 3){ if (CStreaming::HasModelLoaded(MI_FIRETRUCK)) CStreaming::SetModelIsDeletable(MI_FIREMAN); |