diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-09-12 12:11:13 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-09-12 12:11:13 +0200 |
| commit | a3aea359b252feb83684b4b19e5fe58a5dc4e2aa (patch) | |
| tree | 3ebd5b2456abbd7834ed758b7b1edb0bcafac0e1 /src/control/CarCtrl.h | |
| parent | make ATTEMPTS_TO_FIND_NEXT_NODE a define (diff) | |
| download | re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.tar re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.tar.gz re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.tar.bz2 re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.tar.lz re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.tar.xz re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.tar.zst re3-a3aea359b252feb83684b4b19e5fe58a5dc4e2aa.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/control/CarCtrl.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/control/CarCtrl.h b/src/control/CarCtrl.h index b06c1ca2..f545d492 100644 --- a/src/control/CarCtrl.h +++ b/src/control/CarCtrl.h @@ -25,7 +25,7 @@ class CCarCtrl SPECIAL, BIG, TAXI, - CLASS7, + TOTAL_CUSTOM_CLASSES, MAFIA, TRIAD, DIABLO, @@ -65,7 +65,6 @@ public: static float FindMaximumSpeedForThisCarInTraffic(CVehicle*); static void SlowCarDownForCarsSectorList(CPtrList&, CVehicle*, float, float, float, float, float*, float); static void SlowCarDownForPedsSectorList(CPtrList&, CVehicle*, float, float, float, float, float*, float); - static void Init(void); static void SlowCarDownForOtherCar(CEntity*, CVehicle*, float*, float); static float TestCollisionBetween2MovingRects(CVehicle*, CVehicle*, float, float, CVector*, CVector*, uint8); static float FindAngleToWeaveThroughTraffic(CVehicle*, CPhysical*, float, float); @@ -83,6 +82,9 @@ public: static bool PickNextNodeToFollowPath(CVehicle*); static void PickNextNodeRandomly(CVehicle*); static uint8 FindPathDirection(int32, int32, int32); + static void Init(void); + static void ReInit(void); + static bool ThisRoadObjectCouldMove(int16); static float GetOffsetOfLaneFromCenterOfRoad(int8 lane, CCarPathLink* pLink) { @@ -111,14 +113,17 @@ public: static int32 &NumRandomCars; static int32 &NumMissionCars; static int32 &NumParkedCars; + static int32 &NumPermanentCars; static bool &bCarsGeneratedAroundCamera; static float &CarDensityMultiplier; static int8 &CountDownToCarsAtStart; static int32 &MaxNumberOfCarsInUse; static uint32 &LastTimeLawEnforcerCreated; - static int32 (&TotalNumOfCarsOfRating)[7]; - static int32 (&NextCarOfRating)[7]; - static int32 (&CarArrays)[7][MAX_CAR_MODELS_IN_ARRAY]; + 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]; }; extern CVehicle* (&apCarsToKeep)[MAX_CARS_TO_KEEP];
\ No newline at end of file |