diff options
| author | aap <aap@papnet.eu> | 2020-12-09 09:55:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 09:55:50 +0100 |
| commit | ccbbde549e81a7d0e71228ad5c244da6c8bd287f (patch) | |
| tree | b05d46740914289c3e713579716ef7cfa0068244 /src/vehicles | |
| parent | Vehicle cam object collision fix (diff) | |
| parent | sync with upstream (diff) | |
| download | re3-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')
| -rw-r--r-- | src/vehicles/Automobile.h | 6 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.h | 5 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/vehicles/Automobile.h b/src/vehicles/Automobile.h index b2f0643c..1430e7ba 100644 --- a/src/vehicles/Automobile.h +++ b/src/vehicles/Automobile.h @@ -35,6 +35,9 @@ public: float m_aWheelPosition[4]; float m_aWheelSpeed[4]; uint8 m_auto_unused2; +#if (defined GTA_PS2 && !defined FIX_BUGS) + uint8 m_bombType : 3; +#endif uint8 bTaxiLight : 1; uint8 bFixedColour : 1; uint8 bBigWheels : 1; @@ -44,6 +47,9 @@ public: uint8 bTankDetonateCars : 1; uint8 bStuckInSand : 1; uint8 bHeliDestroyed : 1; +#if (defined GTA_PS2 && !defined FIX_BUGS) + CEntity* m_pBombRigger; +#endif int16 m_doingBurnout; uint16 m_hydraulicState; uint32 m_nBusDoorTimerEnd; diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index f083e0f6..56de3562 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -2492,7 +2492,7 @@ IsVehiclePointerValid(CVehicle* pVehicle) { if (!pVehicle) return false; - int index = CPools::GetVehiclePool()->GetJustIndex(pVehicle); + int index = CPools::GetVehiclePool()->GetJustIndex_NoFreeAssert(pVehicle); #ifdef FIX_BUGS if (index < 0 || index >= NUMVEHICLES) #else 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; |