diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-07 22:21:36 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-07 22:21:36 +0200 |
| commit | 2dc818e4d239b96e4f762531a9858a15de36a30f (patch) | |
| tree | 7a6eb7f484c5cc9bb62e544c46f079f7905d897f /src/control/CarCtrl.h | |
| parent | sync with upstream (diff) | |
| download | re3-2dc818e4d239b96e4f762531a9858a15de36a30f.tar re3-2dc818e4d239b96e4f762531a9858a15de36a30f.tar.gz re3-2dc818e4d239b96e4f762531a9858a15de36a30f.tar.bz2 re3-2dc818e4d239b96e4f762531a9858a15de36a30f.tar.lz re3-2dc818e4d239b96e4f762531a9858a15de36a30f.tar.xz re3-2dc818e4d239b96e4f762531a9858a15de36a30f.tar.zst re3-2dc818e4d239b96e4f762531a9858a15de36a30f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/control/CarCtrl.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/control/CarCtrl.h b/src/control/CarCtrl.h index 1ef2fed7..f71fc26f 100644 --- a/src/control/CarCtrl.h +++ b/src/control/CarCtrl.h @@ -36,7 +36,7 @@ public: MOTORBIKE, LEISUREBOAT, WORKERBOAT, - TOTAL_CUSTOM_CLASSES, + COPS, MAFIA, TRIAD, DIABLO, @@ -46,17 +46,14 @@ public: NINES, GANG8, GANG9, - COPS, - CLASS12, - CLASS13, - CLASS14, - CLASS15, - CLASS16, - CLASS17, - CLASS18, - CLASS19, - CLASS20, - COPS_BOAT + 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 }; static void SwitchVehicleToRealPhysics(CVehicle*); @@ -120,6 +117,9 @@ 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 float GetPositionAlongCurrentCurve(CVehicle* pVehicle) { @@ -153,6 +153,8 @@ public: 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]; }; extern CVehicle* apCarsToKeep[MAX_CARS_TO_KEEP];
\ No newline at end of file |