summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Vehicle.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-12-09 09:55:50 +0100
committerGitHub <noreply@github.com>2020-12-09 09:55:50 +0100
commitccbbde549e81a7d0e71228ad5c244da6c8bd287f (patch)
treeb05d46740914289c3e713579716ef7cfa0068244 /src/vehicles/Vehicle.h
parentVehicle cam object collision fix (diff)
parentsync with upstream (diff)
downloadre3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar
re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.gz
re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.bz2
re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.lz
re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.xz
re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.zst
re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.zip
Diffstat (limited to 'src/vehicles/Vehicle.h')
-rw-r--r--src/vehicles/Vehicle.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index 8f2686e1..9386880d 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -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;