diff options
| author | aap <aap@papnet.eu> | 2020-06-15 22:51:47 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-06-15 22:51:47 +0200 |
| commit | dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc (patch) | |
| tree | cd99240de1f87a71af0e7f5938f36fd5f7d77a8c /src/peds/Ped.h | |
| parent | more CCam (diff) | |
| parent | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff) | |
| download | re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.gz re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.bz2 re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.lz re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.xz re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.tar.zst re3-dc7d4e113495fbb53dc9ebc404e9dbfe22b8eedc.zip | |
Diffstat (limited to 'src/peds/Ped.h')
| -rw-r--r-- | src/peds/Ped.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h index 6fd96b66..69d1ba5a 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -594,6 +594,7 @@ public: CEntity *m_pPointGunAt; CVector m_vecHitLastPos; uint32 m_lastFightMove; + uint32 m_lastHitState; // TODO(Miami): What's this? uint8 m_fightButtonPressure; FightState m_fightState; bool m_takeAStepAfterAttack; @@ -756,7 +757,8 @@ public: void SetAttack(CEntity*); void StartFightAttack(uint8); void SetWaitState(eWaitState, void*); - bool FightStrike(CVector&); + bool FightStrike(CVector&, bool); + void FightHitPed(CPed*, CVector&, CVector&, int16); int GetLocalDirection(const CVector2D &); void StartFightDefend(uint8, uint8, uint8); void PlayHitSound(CPed*); @@ -1020,6 +1022,13 @@ public: else return (AnimationId)0; } + + static AnimationId GetFightIdleWithMeleeAnim(CWeaponInfo* weapon) { + if (!!weapon->m_bFightMode) + return ANIM_MELEE_IDLE_FIGHTMODE; + else + return (AnimationId)0; + } // -- // My additions, because there were many, many instances of that. |