summaryrefslogtreecommitdiffstats
path: root/src/control/Garages.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-01-07 14:33:42 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2021-01-07 16:30:35 +0100
commitdb1bdfd62d5d0eb663f9844845de98fdbc0acd02 (patch)
treef85aacb6839356d9720b8dd27666e1033146780c /src/control/Garages.h
parentFix 16KHz track (diff)
downloadre3-db1bdfd62d5d0eb663f9844845de98fdbc0acd02.tar
re3-db1bdfd62d5d0eb663f9844845de98fdbc0acd02.tar.gz
re3-db1bdfd62d5d0eb663f9844845de98fdbc0acd02.tar.bz2
re3-db1bdfd62d5d0eb663f9844845de98fdbc0acd02.tar.lz
re3-db1bdfd62d5d0eb663f9844845de98fdbc0acd02.tar.xz
re3-db1bdfd62d5d0eb663f9844845de98fdbc0acd02.tar.zst
re3-db1bdfd62d5d0eb663f9844845de98fdbc0acd02.zip
Diffstat (limited to '')
-rw-r--r--src/control/Garages.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/control/Garages.h b/src/control/Garages.h
index 46ae1542..3d12d4a2 100644
--- a/src/control/Garages.h
+++ b/src/control/Garages.h
@@ -93,6 +93,7 @@ VALIDATE_SIZE(CStoredCar, 0x28);
class CGarage
{
+public:
uint8 m_eGarageType;
uint8 m_eGarageState;
uint8 m_nMaxStoredCars;
@@ -189,9 +190,6 @@ class CGarage
int32 FindMaxNumStoredCarsForGarage() { return Min(NUM_GARAGE_STORED_CARS, m_nMaxStoredCars); }
- friend class CGarages;
- friend class cAudioManager;
- friend class CCamera;
};
class CGarages
@@ -199,6 +197,7 @@ class CGarages
enum {
MESSAGE_LENGTH = 8,
};
+public:
static int32 BankVansCollected;
static bool BombsAreFree;
static bool RespraysAreFree;
@@ -218,7 +217,6 @@ class CGarages
static CStoredCar aCarsInSafeHouses[TOTAL_HIDEOUT_GARAGES][NUM_GARAGE_STORED_CARS];
static bool bCamShouldBeOutisde;
-public:
static void Init(void);
#ifndef PS2
static void Shutdown(void);
@@ -259,7 +257,6 @@ public:
static void SetFreeResprays(bool bValue) { RespraysAreFree = bValue; }
static void SetMaxNumStoredCarsForGarage(int16 garage, uint8 num) { aGarages[garage].m_nMaxStoredCars = num; }
-private:
static bool IsCarSprayable(CVehicle*);
static float FindDoorHeightForMI(int32);
static void CloseHideOutGaragesBeforeSave(void);
@@ -296,7 +293,4 @@ private:
}
static bool IsThisGarageTypeSafehouse(uint8 type) { return FindSafeHouseIndexForGarageType(type) >= 0; }
- friend class cAudioManager;
- friend class CReplay;
- friend class CGarage;
};