diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-06 17:30:51 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-06 17:30:51 +0100 |
| commit | fe918d41c249205754a48010a9d69cfd25b406ff (patch) | |
| tree | 210d0637ff37875183483aae2dcedbf146b7bf55 /src/control/Garages.h | |
| parent | lil fix (diff) | |
| download | re3-fe918d41c249205754a48010a9d69cfd25b406ff.tar re3-fe918d41c249205754a48010a9d69cfd25b406ff.tar.gz re3-fe918d41c249205754a48010a9d69cfd25b406ff.tar.bz2 re3-fe918d41c249205754a48010a9d69cfd25b406ff.tar.lz re3-fe918d41c249205754a48010a9d69cfd25b406ff.tar.xz re3-fe918d41c249205754a48010a9d69cfd25b406ff.tar.zst re3-fe918d41c249205754a48010a9d69cfd25b406ff.zip | |
Diffstat (limited to 'src/control/Garages.h')
| -rw-r--r-- | src/control/Garages.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/control/Garages.h b/src/control/Garages.h index 04c01719..1c096fdd 100644 --- a/src/control/Garages.h +++ b/src/control/Garages.h @@ -148,8 +148,8 @@ class CGarage return Abs(TheCamera.GetPosition().x - GetGarageCenterX()) > SWITCH_GARAGE_DISTANCE_CLOSE || Abs(TheCamera.GetPosition().y - GetGarageCenterY()) > SWITCH_GARAGE_DISTANCE_CLOSE; #else - return Abs(TheCamera.GetPosition().x - m_fX1) > SWITCH_GARAGE_DISTANCE_CLOSE || - Abs(TheCamera.GetPosition().y - m_fY1) > SWITCH_GARAGE_DISTANCE_CLOSE; + return Abs(TheCamera.GetPosition().x - m_fInfX) > SWITCH_GARAGE_DISTANCE_CLOSE || + Abs(TheCamera.GetPosition().y - m_fInfY) > SWITCH_GARAGE_DISTANCE_CLOSE; #endif } void TidyUpGarageClose(); @@ -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: |