summaryrefslogtreecommitdiffstats
path: root/src/control/CarCtrl.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-08 10:11:09 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-08 10:11:09 +0200
commit44c5cdf453f1b49ce07f7f1b526e2e5808ac245c (patch)
tree2df2f21ec4c8081e8518bb078c2b83ce83c823ac /src/control/CarCtrl.h
parentsync with upstream (diff)
downloadre3-44c5cdf453f1b49ce07f7f1b526e2e5808ac245c.tar
re3-44c5cdf453f1b49ce07f7f1b526e2e5808ac245c.tar.gz
re3-44c5cdf453f1b49ce07f7f1b526e2e5808ac245c.tar.bz2
re3-44c5cdf453f1b49ce07f7f1b526e2e5808ac245c.tar.lz
re3-44c5cdf453f1b49ce07f7f1b526e2e5808ac245c.tar.xz
re3-44c5cdf453f1b49ce07f7f1b526e2e5808ac245c.tar.zst
re3-44c5cdf453f1b49ce07f7f1b526e2e5808ac245c.zip
Diffstat (limited to 'src/control/CarCtrl.h')
-rw-r--r--src/control/CarCtrl.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/control/CarCtrl.h b/src/control/CarCtrl.h
index 9f5deebe..cd7383b2 100644
--- a/src/control/CarCtrl.h
+++ b/src/control/CarCtrl.h
@@ -69,7 +69,7 @@ public:
static void ScanForPedDanger(CVehicle *veh);
static void RemoveFromInterestingVehicleList(CVehicle*);
static void GenerateRandomCars(void);
- static void GenerateOneRandomCar(void);
+ static int GenerateOneRandomCar(void);
static void GenerateEmergencyServicesCar(void);
static int32 ChooseModel(CZoneInfo*, CVector*, int*);
static int32 ChoosePoliceCarModel(void);
@@ -122,6 +122,9 @@ public:
static int32 ChooseBoatModel(int32);
static int32 ChooseBoatRating(CZoneInfo* pZoneInfo);
static int32 ChooseCarRating(CZoneInfo* pZoneInfo);
+ static void AddToLoadedVehicleArray(int32 mi, int32 rating, int32 freq);
+ static void RemoveFromLoadedVehicleArray(int32 mi, int32 rating);
+ static int32 ChooseCarModelToLoad(int rating);
static float GetPositionAlongCurrentCurve(CVehicle* pVehicle)
{
@@ -153,10 +156,12 @@ public:
static uint32 LastTimeFireTruckCreated;
static uint32 LastTimeAmbulanceCreated;
static int32 TotalNumOfCarsOfRating[TOTAL_CUSTOM_CLASSES];
- static int32 NextCarOfRating[TOTAL_CUSTOM_CLASSES];
static int32 CarArrays[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY];
static int32 NumRequestsOfCarRating[TOTAL_CUSTOM_CLASSES];
+ static int32 NumOfLoadedCarsOfRating[TOTAL_CUSTOM_CLASSES];
+ static int32 CarFreqArrays[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY];
+ static int32 LoadedCarsArray[TOTAL_CUSTOM_CLASSES][MAX_CAR_MODELS_IN_ARRAY];
};
extern CVehicle* apCarsToKeep[MAX_CARS_TO_KEEP]; \ No newline at end of file