summaryrefslogtreecommitdiffstats
path: root/src/control/Garages.h
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2020-12-07 00:56:12 +0100
committerwithmorten <morten.with@gmail.com>2020-12-07 00:56:12 +0100
commitafdf8c25a05f280f524d946384cf74d69aa16e8a (patch)
treeac8168c89de8d1738d6c6fc488f1f0c492f0592a /src/control/Garages.h
parentuint8 enums fixed (diff)
downloadre3-afdf8c25a05f280f524d946384cf74d69aa16e8a.tar
re3-afdf8c25a05f280f524d946384cf74d69aa16e8a.tar.gz
re3-afdf8c25a05f280f524d946384cf74d69aa16e8a.tar.bz2
re3-afdf8c25a05f280f524d946384cf74d69aa16e8a.tar.lz
re3-afdf8c25a05f280f524d946384cf74d69aa16e8a.tar.xz
re3-afdf8c25a05f280f524d946384cf74d69aa16e8a.tar.zst
re3-afdf8c25a05f280f524d946384cf74d69aa16e8a.zip
Diffstat (limited to 'src/control/Garages.h')
-rw-r--r--src/control/Garages.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/control/Garages.h b/src/control/Garages.h
index 41b2afb7..79cef36e 100644
--- a/src/control/Garages.h
+++ b/src/control/Garages.h
@@ -7,7 +7,7 @@
class CVehicle;
class CCamera;
-enum eGarageState : int8
+enum eGarageState
{
GS_FULLYCLOSED,
GS_OPENED,
@@ -18,7 +18,7 @@ enum eGarageState : int8
GS_AFTERDROPOFF,
};
-enum eGarageType : int8
+enum eGarageType
{
GARAGE_NONE,
GARAGE_MISSION,
@@ -81,8 +81,8 @@ VALIDATE_SIZE(CStoredCar, 0x28);
class CGarage
{
- eGarageType m_eGarageType;
- eGarageState m_eGarageState;
+ uint8 m_eGarageType;
+ uint8 m_eGarageState;
bool field_2; // unused
bool m_bClosingWithoutTargetCar;
bool m_bDeactivated;
@@ -207,8 +207,8 @@ public:
#endif
static void Update(void);
- static int16 AddOne(CVector pos1, CVector pos2, eGarageType type, int32 targetId);
- static void ChangeGarageType(int16, eGarageType, int32);
+ static int16 AddOne(CVector pos1, CVector pos2, uint8 type, int32 targetId);
+ static void ChangeGarageType(int16, uint8, int32);
static void PrintMessages(void);
static void TriggerMessage(const char* text, int16, uint16 time, int16);
static void SetTargetCarForMissonGarage(int16, CVehicle*);
@@ -244,10 +244,10 @@ private:
static bool IsCarSprayable(CVehicle*);
static float FindDoorHeightForMI(int32);
static void CloseHideOutGaragesBeforeSave(void);
- static int32 CountCarsInHideoutGarage(eGarageType);
- static int32 FindMaxNumStoredCarsForGarage(eGarageType);
- static int32 GetBombTypeForGarageType(eGarageType type) { return type - GARAGE_BOMBSHOP1 + 1; }
- static int32 GetCarsCollectedIndexForGarageType(eGarageType type) { return type - GARAGE_COLLECTCARS_1; }
+ static int32 CountCarsInHideoutGarage(uint8);
+ static int32 FindMaxNumStoredCarsForGarage(uint8);
+ static int32 GetBombTypeForGarageType(uint8 type) { return type - GARAGE_BOMBSHOP1 + 1; }
+ static int32 GetCarsCollectedIndexForGarageType(uint8 type) { return type - GARAGE_COLLECTCARS_1; }
friend class cAudioManager;
friend class CGarage;