summaryrefslogtreecommitdiffstats
path: root/src/peds/Ped.h
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-06-15 22:43:20 +0200
committereray orçunus <erayorcunus@gmail.com>2020-06-15 22:43:20 +0200
commitc4e129509b9ca8eb8136807a3d36cf93b5498390 (patch)
treec94b6caa329fae54293bc8dc261ace2fc89d0907 /src/peds/Ped.h
parentFix vehicle cam. zoom values (diff)
downloadre3-c4e129509b9ca8eb8136807a3d36cf93b5498390.tar
re3-c4e129509b9ca8eb8136807a3d36cf93b5498390.tar.gz
re3-c4e129509b9ca8eb8136807a3d36cf93b5498390.tar.bz2
re3-c4e129509b9ca8eb8136807a3d36cf93b5498390.tar.lz
re3-c4e129509b9ca8eb8136807a3d36cf93b5498390.tar.xz
re3-c4e129509b9ca8eb8136807a3d36cf93b5498390.tar.zst
re3-c4e129509b9ca8eb8136807a3d36cf93b5498390.zip
Diffstat (limited to '')
-rw-r--r--src/peds/Ped.h11
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.