diff options
| author | aap <aap@papnet.eu> | 2020-12-09 09:55:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 09:55:50 +0100 |
| commit | ccbbde549e81a7d0e71228ad5c244da6c8bd287f (patch) | |
| tree | b05d46740914289c3e713579716ef7cfa0068244 /src/control/Garages.h | |
| parent | Vehicle cam object collision fix (diff) | |
| parent | sync with upstream (diff) | |
| download | re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.gz re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.bz2 re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.lz re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.xz re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.zst re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.zip | |
Diffstat (limited to 'src/control/Garages.h')
| -rw-r--r-- | src/control/Garages.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/control/Garages.h b/src/control/Garages.h index 26a5ab41..46ae1542 100644 --- a/src/control/Garages.h +++ b/src/control/Garages.h @@ -187,7 +187,7 @@ class CGarage bool IsPointInsideGarage(CVector, float); void ThrowCarsNearDoorOutOfGarage(CVehicle*); - int32 FindMaxNumStoredCarsForGarage() { return Max(NUM_GARAGE_STORED_CARS, m_nMaxStoredCars); } + int32 FindMaxNumStoredCarsForGarage() { return Min(NUM_GARAGE_STORED_CARS, m_nMaxStoredCars); } friend class CGarages; friend class cAudioManager; @@ -198,7 +198,6 @@ class CGarages { enum { MESSAGE_LENGTH = 8, - MAX_NUM_CARS_IN_HIDEOUT_GARAGE = 4 }; static int32 BankVansCollected; static bool BombsAreFree; @@ -216,8 +215,7 @@ class CGarages static bool PlayerInGarage; static int32 PoliceCarsCollected; static CGarage aGarages[NUM_GARAGES]; - static CStoredCar aCarsInSafeHouses[TOTAL_HIDEOUT_GARAGES][MAX_NUM_CARS_IN_HIDEOUT_GARAGE]; - static int32 AudioEntity; + static CStoredCar aCarsInSafeHouses[TOTAL_HIDEOUT_GARAGES][NUM_GARAGE_STORED_CARS]; static bool bCamShouldBeOutisde; public: |