diff options
author | withmorten <morten.with@gmail.com> | 2021-07-05 18:07:26 +0200 |
---|---|---|
committer | withmorten <morten.with@gmail.com> | 2021-07-10 17:30:27 +0200 |
commit | 011aafa0435d2c60dc4e0769ed4c93ed1761e3f6 (patch) | |
tree | 4f6c78844f547651730f82043b28662a9b7239e9 /src/control/Garages.h | |
parent | readme: fix lto option (diff) | |
download | re3-011aafa0435d2c60dc4e0769ed4c93ed1761e3f6.tar re3-011aafa0435d2c60dc4e0769ed4c93ed1761e3f6.tar.gz re3-011aafa0435d2c60dc4e0769ed4c93ed1761e3f6.tar.bz2 re3-011aafa0435d2c60dc4e0769ed4c93ed1761e3f6.tar.lz re3-011aafa0435d2c60dc4e0769ed4c93ed1761e3f6.tar.xz re3-011aafa0435d2c60dc4e0769ed4c93ed1761e3f6.tar.zst re3-011aafa0435d2c60dc4e0769ed4c93ed1761e3f6.zip |
Diffstat (limited to 'src/control/Garages.h')
-rw-r--r-- | src/control/Garages.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/control/Garages.h b/src/control/Garages.h index a7dfa462..8a9fd1b6 100644 --- a/src/control/Garages.h +++ b/src/control/Garages.h @@ -51,14 +51,17 @@ enum class CStoredCar { + enum { + FLAG_BULLETPROOF = 0x1, + FLAG_FIREPROOF = 0x2, + FLAG_EXPLOSIONPROOF = 0x4, + FLAG_COLLISIONPROOF = 0x8, + FLAG_MELEEPROOF = 0x10, + }; int32 m_nModelIndex; CVector m_vecPos; CVector m_vecAngle; - int32 m_bBulletproof : 1; - int32 m_bFireproof : 1; - int32 m_bExplosionproof : 1; - int32 m_bCollisionproof : 1; - int32 m_bMeleeproof : 1; + int32 m_nFlags; int8 m_nPrimaryColor; int8 m_nSecondaryColor; int8 m_nRadioStation; @@ -78,6 +81,13 @@ VALIDATE_SIZE(CStoredCar, 0x28); #define SWITCH_GARAGE_DISTANCE_CLOSE 40.0f +#define CRUSHER_GARAGE_X1 (1135.5f) +#define CRUSHER_GARAGE_Y1 (57.0f) +#define CRUSHER_GARAGE_Z1 (-1.0f) +#define CRUSHER_GARAGE_X2 (1149.5f) +#define CRUSHER_GARAGE_Y2 (63.7f) +#define CRUSHER_GARAGE_Z2 (3.5f) + class CGarage { public: @@ -87,7 +97,7 @@ public: bool m_bClosingWithoutTargetCar; bool m_bDeactivated; bool m_bResprayHappened; - int m_nTargetModelIndex; + int32 m_nTargetModelIndex; CEntity *m_pDoor1; CEntity *m_pDoor2; uint8 m_bDoor1PoolIndex; |