diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-07 22:22:15 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-07 22:22:15 +0200 |
| commit | b99346e6ca8bd6ee8d8d6b7cf1b21b9d06b0ab04 (patch) | |
| tree | ab07a4b632108268d62700baf702536c1e87b4f9 /src/core/Zones.h | |
| parent | intermediate changes (diff) | |
| parent | CBaseModelInfo done (diff) | |
| download | re3-b99346e6ca8bd6ee8d8d6b7cf1b21b9d06b0ab04.tar re3-b99346e6ca8bd6ee8d8d6b7cf1b21b9d06b0ab04.tar.gz re3-b99346e6ca8bd6ee8d8d6b7cf1b21b9d06b0ab04.tar.bz2 re3-b99346e6ca8bd6ee8d8d6b7cf1b21b9d06b0ab04.tar.lz re3-b99346e6ca8bd6ee8d8d6b7cf1b21b9d06b0ab04.tar.xz re3-b99346e6ca8bd6ee8d8d6b7cf1b21b9d06b0ab04.tar.zst re3-b99346e6ca8bd6ee8d8d6b7cf1b21b9d06b0ab04.zip | |
Diffstat (limited to 'src/core/Zones.h')
| -rw-r--r-- | src/core/Zones.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/core/Zones.h b/src/core/Zones.h index 992bda2d..a3e5c2aa 100644 --- a/src/core/Zones.h +++ b/src/core/Zones.h @@ -2,6 +2,7 @@ #include "Game.h" #include "Gangs.h" +#include "CarCtrl.h" enum eZoneType { @@ -37,14 +38,15 @@ class CZoneInfo public: // Car data int16 carDensity; - int16 carThreshold[6]; - int16 copThreshold; + int16 carThreshold[CCarCtrl::NUM_CAR_CLASSES]; + int16 boatThreshold[CCarCtrl::NUM_BOAT_CLASSES]; int16 gangThreshold[NUM_GANGS]; + int16 copThreshold; // Ped data uint16 pedDensity; - uint16 copDensity; - uint16 gangDensity[NUM_GANGS]; + uint16 gangPedThreshold[NUM_GANGS]; + uint16 copPedThreshold; uint16 pedGroup; }; @@ -90,12 +92,7 @@ public: static CZoneInfo *GetZoneInfo(const CVector *v, uint8 day); static void GetZoneInfoForTimeOfDay(const CVector *pos, CZoneInfo *info); static void SetZoneCarInfo(uint16 zoneid, uint8 day, int16 carDensity, - int16 gang0Num, int16 gang1Num, int16 gang2Num, - int16 gang3Num, int16 gang4Num, int16 gang5Num, - int16 gang6Num, int16 gang7Num, int16 gang8Num, - int16 copNum, - int16 car0Num, int16 car1Num, int16 car2Num, - int16 car3Num, int16 car4Num, int16 car5Num); + int16 copCarDensity, const int16 *gangCarDensities /*[NUMGANGS]*/); static void SetZonePedInfo(uint16 zoneid, uint8 day, int16 pedDensity, int16 gang0Density, int16 gang1Density, int16 gang2Density, int16 gang3Density, int16 gang4Density, int16 gang5Density, int16 gang6Density, int16 gang7Density, |