diff options
| author | aap <aap@papnet.eu> | 2019-07-18 15:41:09 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2019-07-18 15:41:09 +0200 |
| commit | fd01f9b25cdc3b527a886ee6b9237b01a5475295 (patch) | |
| tree | 6db1dbfeb6feedcf79e870f417b82af29da7ca21 /src/vehicles/Vehicle.h | |
| parent | Merge pull request #147 from erorcun/erorcun (diff) | |
| download | re3-fd01f9b25cdc3b527a886ee6b9237b01a5475295.tar re3-fd01f9b25cdc3b527a886ee6b9237b01a5475295.tar.gz re3-fd01f9b25cdc3b527a886ee6b9237b01a5475295.tar.bz2 re3-fd01f9b25cdc3b527a886ee6b9237b01a5475295.tar.lz re3-fd01f9b25cdc3b527a886ee6b9237b01a5475295.tar.xz re3-fd01f9b25cdc3b527a886ee6b9237b01a5475295.tar.zst re3-fd01f9b25cdc3b527a886ee6b9237b01a5475295.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/vehicles/Vehicle.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index de74264b..7513c0da 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -130,7 +130,7 @@ public: uint8 m_currentColour1; uint8 m_currentColour2; uint8 m_aExtras[2]; - int16 m_nAlarmState; // m_nWantedStarsOnEnter on DK22 + int16 m_nAlarmState; int16 m_nMissionValue; CPed *pDriver; CPed *pPassengers[8]; @@ -188,7 +188,7 @@ public: uint8 m_nAmmoInClip; // Used to make the guns on boat do a reload (20 by default) int8 field_1FB; int8 field_1FC[4]; - float m_fHealth; // 1000.0f = full health. 0 -> explode + float m_fHealth; // 1000.0f = full health. 250.0f = fire. 0 -> explode uint8 m_nCurrentGear; int8 field_205[3]; float m_fChangeGearTime; @@ -277,6 +277,8 @@ public: void RemoveDriver(void); void ProcessCarAlarm(void); bool IsSphereTouchingVehicle(float sx, float sy, float sz, float radius); + + bool IsAlarmOn(void) { return m_nAlarmState != 0 && m_nAlarmState != -1; } static bool &bWheelsOnlyCheat; static bool &bAllDodosCheat; |