Merge pull request #869 from Nick007J/miami

garages revision + fixes
This commit is contained in:
aap 2020-12-09 09:55:50 +01:00 committed by GitHub
commit ccbbde549e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 240 additions and 161 deletions

View file

@ -248,8 +248,9 @@ public:
uint8 bRestingOnPhysical : 1; // Dont go static cause car is sitting on a physical object that might get removed
uint8 bParking : 1;
uint8 bCanPark : 1;
#if (!defined GTA_PS2 || defined FIX_BUGS)
uint8 m_bombType : 3;
#endif
uint8 bDriverLastFrame : 1;
int8 m_numPedsUseItAsCover;
@ -259,7 +260,9 @@ public:
float m_fHealth; // 1000.0f = full health. 250.0f = fire. 0 -> explode
uint8 m_nCurrentGear;
float m_fChangeGearTime;
#if (!defined GTA_PS2 || defined FIX_BUGS)
CEntity* m_pBombRigger;
#endif
uint32 m_nSetPieceExtendedRangeTime;
uint32 m_nGunFiringTime; // last time when gun on vehicle was fired (used on boats)
uint32 m_nTimeOfDeath;