diff options
| author | aap <aap@papnet.eu> | 2020-05-08 11:04:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 11:04:00 +0200 |
| commit | 2171ebe2dae896303b2da9716630096ba3921673 (patch) | |
| tree | 70be3e22307bc947702b0d12c7fc5fb802c3f1ef /src/control/CarCtrl.h | |
| parent | Merge remote-tracking branch 'origin/master' into miami (diff) | |
| parent | final fix (diff) | |
| download | re3-2171ebe2dae896303b2da9716630096ba3921673.tar re3-2171ebe2dae896303b2da9716630096ba3921673.tar.gz re3-2171ebe2dae896303b2da9716630096ba3921673.tar.bz2 re3-2171ebe2dae896303b2da9716630096ba3921673.tar.lz re3-2171ebe2dae896303b2da9716630096ba3921673.tar.xz re3-2171ebe2dae896303b2da9716630096ba3921673.tar.zst re3-2171ebe2dae896303b2da9716630096ba3921673.zip | |
Diffstat (limited to 'src/control/CarCtrl.h')
| -rw-r--r-- | src/control/CarCtrl.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/control/CarCtrl.h b/src/control/CarCtrl.h index 8f5b6ef8..ce25c206 100644 --- a/src/control/CarCtrl.h +++ b/src/control/CarCtrl.h @@ -48,10 +48,13 @@ public: NINES, GANG8, GANG9, - COPSBOAT, - - NUM_CAR_CLASSES = MOTORBIKE+1, - NUM_BOAT_CLASSES = 2, + COPS_BOAT, + FIRST_CAR_RATING = NORMAL, + FIRST_BOAT_RATING = LEISUREBOAT, + FIRST_GANG_CAR_RATING = MAFIA, + NUM_CAR_CLASSES = MOTORBIKE - FIRST_CAR_RATING + 1, + NUM_BOAT_CLASSES = WORKERBOAT - FIRST_BOAT_RATING + 1, + NUM_GANG_CAR_CLASSES = GANG9 - FIRST_GANG_CAR_RATING + 1, TOTAL_CUSTOM_CLASSES = NUM_CAR_CLASSES + NUM_BOAT_CLASSES }; @@ -116,6 +119,12 @@ public: static void FindLinksToGoWithTheseNodes(CVehicle*); static bool GenerateOneEmergencyServicesCar(uint32, CVector); static float FindSpeedMultiplierWithSpeedFromNodes(int8); + 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) { @@ -147,8 +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 |