summaryrefslogtreecommitdiffstats
path: root/src/peds/Ped.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-09-07 00:36:53 +0200
committerGitHub <noreply@github.com>2019-09-07 00:36:53 +0200
commit3378cad058a1def5f3b9f2e2704e9e788be9b9f8 (patch)
tree375f15e45411e4aea71c9c682c674d7bdb519cd5 /src/peds/Ped.h
parentMerge pull request #201 from erorcun/erorcun (diff)
parentPeds (diff)
downloadre3-3378cad058a1def5f3b9f2e2704e9e788be9b9f8.tar
re3-3378cad058a1def5f3b9f2e2704e9e788be9b9f8.tar.gz
re3-3378cad058a1def5f3b9f2e2704e9e788be9b9f8.tar.bz2
re3-3378cad058a1def5f3b9f2e2704e9e788be9b9f8.tar.lz
re3-3378cad058a1def5f3b9f2e2704e9e788be9b9f8.tar.xz
re3-3378cad058a1def5f3b9f2e2704e9e788be9b9f8.tar.zst
re3-3378cad058a1def5f3b9f2e2704e9e788be9b9f8.zip
Diffstat (limited to 'src/peds/Ped.h')
-rw-r--r--src/peds/Ped.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 0fb46160..3003cd2d 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -308,7 +308,7 @@ public:
uint8 bWanderPathAfterExitingCar : 1;
uint8 m_ped_flagF2 : 1;
- uint8 m_ped_flagF4 : 1;
+ uint8 m_ped_flagF4 : 1; // Unfinished feature from VC
uint8 m_ped_flagF8 : 1;
uint8 bWillBeQuickJacked : 1;
uint8 bCancelEnteringCar : 1; // after door is opened or couldn't be opened due to it's locked
@@ -637,7 +637,6 @@ public:
void MoveHeadToLook(void);
void Pause(void);
void ProcessBuoyancy(void);
- bool ServiceTalkingWhenDead(void);
void ServiceTalking(void);
void SetJump(void);
void UpdatePosition(void);
@@ -669,7 +668,7 @@ public:
static void PedAnimDoorOpenCB(CAnimBlendAssociation *assoc, void *arg);
static void PedAnimPullPedOutCB(CAnimBlendAssociation *assoc, void *arg);
static void PedAnimDoorCloseCB(CAnimBlendAssociation *assoc, void *arg);
- static void SetInCarCB(CAnimBlendAssociation *assoc, void *arg);
+ static void PedSetInCarCB(CAnimBlendAssociation *assoc, void *arg);
static void PedSetOutCarCB(CAnimBlendAssociation *assoc, void *arg);
static void PedAnimAlignCB(CAnimBlendAssociation *assoc, void *arg);
static void PedSetDraggedOutCarCB(CAnimBlendAssociation *assoc, void *arg);
@@ -714,6 +713,7 @@ public:
void SetInTheAir(void);
void RestoreHeadPosition(void);
void PointGunAt(void);
+ bool ServiceTalkingWhenDead(void);
bool HasWeapon(uint8 weaponType) { return m_weapons[weaponType].m_eWeaponType == weaponType; }
CWeapon &GetWeapon(uint8 weaponType) { return m_weapons[weaponType]; }