summaryrefslogtreecommitdiffstats
path: root/src/control/CarCtrl.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-01-20 19:14:12 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2021-01-20 19:14:12 +0100
commit23831e38e632073c9d1fc5ff073b1568c02e33b8 (patch)
treee2386110918e4424e26d33a8a9c9d0e9ea46fa2c /src/control/CarCtrl.cpp
parentMerge branch 'lcs-dev' into lcs (diff)
parentMerge branch 'miami' into lcs (diff)
downloadre3-23831e38e632073c9d1fc5ff073b1568c02e33b8.tar
re3-23831e38e632073c9d1fc5ff073b1568c02e33b8.tar.gz
re3-23831e38e632073c9d1fc5ff073b1568c02e33b8.tar.bz2
re3-23831e38e632073c9d1fc5ff073b1568c02e33b8.tar.lz
re3-23831e38e632073c9d1fc5ff073b1568c02e33b8.tar.xz
re3-23831e38e632073c9d1fc5ff073b1568c02e33b8.tar.zst
re3-23831e38e632073c9d1fc5ff073b1568c02e33b8.zip
Diffstat (limited to 'src/control/CarCtrl.cpp')
-rw-r--r--src/control/CarCtrl.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 15cfee11..6abeae64 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -36,6 +36,7 @@
#include "WaterLevel.h"
#include "World.h"
#include "Zones.h"
+#include "Pickups.h"
#define DISTANCE_TO_SPAWN_ROADBLOCK_PEDS (51.0f)
#define DISTANCE_TO_SCAN_FOR_DANGER (14.0f)
@@ -3219,8 +3220,9 @@ void CCarCtrl::GenerateEmergencyServicesCar(void)
CStreaming::RequestModel(MI_AMBULAN, STREAMFLAGS_DEPENDENCY);
CStreaming::RequestModel(MI_MEDIC, STREAMFLAGS_DONT_REMOVE);
if (CStreaming::HasModelLoaded(MI_AMBULAN) && CStreaming::HasModelLoaded(MI_MEDIC)){
- if (GenerateOneEmergencyServicesCar(MI_AMBULAN, pNearestAccident->m_pVictim->GetPosition()))
+ if (GenerateOneEmergencyServicesCar(MI_AMBULAN, pNearestAccident->m_pVictim->GetPosition())){
LastTimeAmbulanceCreated = CTimer::GetTimeInMilliseconds();
+ }
}
}
}
@@ -3238,8 +3240,15 @@ void CCarCtrl::GenerateEmergencyServicesCar(void)
CStreaming::RequestModel(MI_FIRETRUCK, STREAMFLAGS_DEPENDENCY);
CStreaming::RequestModel(MI_FIREMAN, STREAMFLAGS_DONT_REMOVE);
if (CStreaming::HasModelLoaded(MI_FIRETRUCK) && CStreaming::HasModelLoaded(MI_FIREMAN)){
- if (GenerateOneEmergencyServicesCar(MI_FIRETRUCK, pNearestFire->m_vecPos))
+ if (GenerateOneEmergencyServicesCar(MI_FIRETRUCK, pNearestFire->m_vecPos)){
LastTimeFireTruckCreated = CTimer::GetTimeInMilliseconds();
+#ifdef SECUROM
+ if ((myrand() & 7) == 5){
+ // if pirated game
+ CPickups::Init();
+ }
+#endif
+ }
}
}
}