diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-07-20 21:47:41 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-07-20 21:47:41 +0200 |
| commit | 70df13f9d34fd855b78f74d7f1da8423241f8b01 (patch) | |
| tree | 6c71b19b940fd919c5b76437180ab35f24c02f40 /src/peds/Ped.h | |
| parent | avoid UB (diff) | |
| download | re3-70df13f9d34fd855b78f74d7f1da8423241f8b01.tar re3-70df13f9d34fd855b78f74d7f1da8423241f8b01.tar.gz re3-70df13f9d34fd855b78f74d7f1da8423241f8b01.tar.bz2 re3-70df13f9d34fd855b78f74d7f1da8423241f8b01.tar.lz re3-70df13f9d34fd855b78f74d7f1da8423241f8b01.tar.xz re3-70df13f9d34fd855b78f74d7f1da8423241f8b01.tar.zst re3-70df13f9d34fd855b78f74d7f1da8423241f8b01.zip | |
Diffstat (limited to 'src/peds/Ped.h')
| -rw-r--r-- | src/peds/Ped.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h index d600c409..63d8e598 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -480,7 +480,7 @@ public: uint8 m_wepAccuracy; CEntity *m_pPointGunAt; CVector m_vecHitLastPos; - uint32 m_lastFightMove; + uint32 m_curFightMove; uint8 m_fightButtonPressure; FightState m_fightState; bool m_takeAStepAfterAttack; @@ -802,6 +802,7 @@ public: bool Dying(void) { return m_nPedState == PED_DIE; } bool DyingOrDead(void) { return m_nPedState == PED_DIE || m_nPedState == PED_DEAD; } bool OnGround(void) { return m_nPedState == PED_FALL || m_nPedState == PED_DIE || m_nPedState == PED_DEAD; } + bool OnGroundOrGettingUp(void) { return OnGround() || m_nPedState == PED_GETUP; } bool Driving(void) { return m_nPedState == PED_DRIVING; } bool InVehicle(void) { return bInVehicle && m_pMyVehicle; } // True when ped is sitting/standing in vehicle, not in enter/exit state. |