diff options
| author | aap <aap@papnet.eu> | 2020-05-11 23:28:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 23:28:52 +0200 |
| commit | ce2071e1e6c21911b215e47815687f5a64328c66 (patch) | |
| tree | c73ccad82576f5e27627b85e7c8b3f914881f5e8 /src/vehicles | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| parent | sync with upstream (diff) | |
| download | re3-ce2071e1e6c21911b215e47815687f5a64328c66.tar re3-ce2071e1e6c21911b215e47815687f5a64328c66.tar.gz re3-ce2071e1e6c21911b215e47815687f5a64328c66.tar.bz2 re3-ce2071e1e6c21911b215e47815687f5a64328c66.tar.lz re3-ce2071e1e6c21911b215e47815687f5a64328c66.tar.xz re3-ce2071e1e6c21911b215e47815687f5a64328c66.tar.zst re3-ce2071e1e6c21911b215e47815687f5a64328c66.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/vehicles/Automobile.h | 2 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/vehicles/Automobile.h b/src/vehicles/Automobile.h index b9f130f8..8c5c8f8e 100644 --- a/src/vehicles/Automobile.h +++ b/src/vehicles/Automobile.h @@ -84,7 +84,6 @@ public: float m_aWheelPosition[4]; float m_aWheelSpeed[4]; uint8 field_4D8; - uint8 m_bombType : 3; uint8 bTaxiLight : 1; uint8 bHadDriver : 1; // for bombs uint8 bFixedColour : 1; @@ -92,7 +91,6 @@ public: uint8 bWaterTight : 1; // no damage for non-player peds uint8 bNotDamagedUpsideDown : 1; uint8 bMoreResistantToDamage : 1; - CEntity *m_pBombRigger; int16 field_4E0; uint16 m_hydraulicState; uint32 m_nBusDoorTimerEnd; diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index 0ef454fd..cdf0595a 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -187,6 +187,8 @@ public: uint8 bCreatedAsPoliceVehicle : 1;// True if this guy was created as a police vehicle (enforcer, policecar, miamivice car etc) uint8 bParking : 1; + uint8 m_bombType : 3; + int8 m_numPedsUseItAsCover; uint8 m_nAmmoInClip; // Used to make the guns on boat do a reload (20 by default) int8 m_nPacManPickupsCarried; @@ -195,6 +197,7 @@ public: float m_fHealth; // 1000.0f = full health. 250.0f = fire. 0 -> explode uint8 m_nCurrentGear; float m_fChangeGearTime; + CEntity* m_pBombRigger; uint32 m_nGunFiringTime; // last time when gun on vehicle was fired (used on boats) uint32 m_nTimeOfDeath; uint16 m_nTimeBlocked; |