diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-30 23:38:00 +0100 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-30 23:38:00 +0100 |
commit | 07a5cc654474ffe09ae5ce45b3ec1a7f0e004379 (patch) | |
tree | 4b8e9afcaaa21b4e0eaa4acb1aac687786881a40 /src/control/Garages.h | |
parent | Merge branch 'lcs' into lcs-dev (diff) | |
download | re3-07a5cc654474ffe09ae5ce45b3ec1a7f0e004379.tar re3-07a5cc654474ffe09ae5ce45b3ec1a7f0e004379.tar.gz re3-07a5cc654474ffe09ae5ce45b3ec1a7f0e004379.tar.bz2 re3-07a5cc654474ffe09ae5ce45b3ec1a7f0e004379.tar.lz re3-07a5cc654474ffe09ae5ce45b3ec1a7f0e004379.tar.xz re3-07a5cc654474ffe09ae5ce45b3ec1a7f0e004379.tar.zst re3-07a5cc654474ffe09ae5ce45b3ec1a7f0e004379.zip |
Diffstat (limited to '')
-rw-r--r-- | src/control/Garages.h | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/src/control/Garages.h b/src/control/Garages.h index 5235275e..eb2c3e18 100644 --- a/src/control/Garages.h +++ b/src/control/Garages.h @@ -6,8 +6,6 @@ class CVehicle; -#define GTA_NETWORK - enum eGarageState { GS_FULLYCLOSED, @@ -61,19 +59,34 @@ enum { TOTAL_COLLECTCARS_GARAGES = 4, TOTAL_HIDEOUT_GARAGES = 12, - TOTAL_COLLECTCARS_CARS = 6 + TOTAL_COLLECTCARS_CARS = 16 }; class CStoredCar { + enum { + FLAG_BULLETPROOF = 0x1, + FLAG_FIREPROOF = 0x2, + FLAG_EXPLOSIONPROOF = 0x4, + FLAG_COLLISIONPROOF = 0x8, + FLAG_MELEEPROOF = 0x10, + FLAG_TIRES_INVULNERABLE = 0x20, + FLAG_STRONG = 0x40, + FLAG_HEAVY = 0x80, + FLAG_PERMANENT_COLOUR = 0x100, + FLAG_BOMB = 0x200, + FLAG_NOT_DAMAGED_UPSIDEDOWN = 0x400, + FLAG_REWARD_VEHICLE = 0x8000 + }; 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; + float m_fPosX; + float m_fPosY; + float m_fPosZ; + float m_fForwardX; + float m_fForwardY; + float m_fForwardZ; + float m_fTractionMultiplier; + int32 m_nFlags; int8 m_nPrimaryColor; int8 m_nSecondaryColor; int8 m_nRadioStation; @@ -84,7 +97,6 @@ public: void Init() { m_nModelIndex = 0; } void Clear() { m_nModelIndex = 0; } bool HasCar() { return m_nModelIndex != 0; } - const CStoredCar &operator=(const CStoredCar& other); void StoreCar(CVehicle*); CVehicle* RestoreCar(); }; |