summaryrefslogtreecommitdiffstats
path: root/src/entities/Ped.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-19 14:06:13 +0200
committeraap <aap@papnet.eu>2019-06-19 14:06:13 +0200
commit78e33785ecfd176616b1a1b1588c771b978a4c19 (patch)
tree6abde4ca51c0f477ce63288215b510a462e52e50 /src/entities/Ped.h
parentMerge pull request #22 from erorcun/master (diff)
downloadre3-78e33785ecfd176616b1a1b1588c771b978a4c19.tar
re3-78e33785ecfd176616b1a1b1588c771b978a4c19.tar.gz
re3-78e33785ecfd176616b1a1b1588c771b978a4c19.tar.bz2
re3-78e33785ecfd176616b1a1b1588c771b978a4c19.tar.lz
re3-78e33785ecfd176616b1a1b1588c771b978a4c19.tar.xz
re3-78e33785ecfd176616b1a1b1588c771b978a4c19.tar.zst
re3-78e33785ecfd176616b1a1b1588c771b978a4c19.zip
Diffstat (limited to '')
-rw-r--r--src/entities/Ped.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/entities/Ped.h b/src/entities/Ped.h
index f9e46dae..60b88765 100644
--- a/src/entities/Ped.h
+++ b/src/entities/Ped.h
@@ -97,7 +97,7 @@ public:
uint8 m_ped_flagA2 : 1;
uint8 m_ped_flagA4 : 1; // stores (CTimer::GetTimeInMilliseconds() < m_lastHitTime)
uint8 m_ped_flagA8 : 1;
- uint8 m_ped_flagA10 : 1; // set when A20 just changed?
+ uint8 bIsLooking : 1; // set when A20 just changed?
uint8 m_ped_flagA20_look : 1;
uint8 m_ped_flagA40 : 1;
uint8 m_ped_flagA80 : 1;
@@ -222,7 +222,7 @@ public:
int32 m_pPointGunAt;
CVector m_vecHitLastPos;
uint8 stuff8[12];
- CPed *m_pPedFight;
+ CEntity *m_pLookTarget;
float m_fLookDirection;
int32 m_wepModelID;
uint32 m_leaveCarTimer;
@@ -240,21 +240,20 @@ public:
static void *operator new(size_t);
static void operator delete(void*, size_t);
- // TODO: enum!
- bool IsPlayer(void) { return m_nPedType == 0 || m_nPedType== 1 || m_nPedType == 2 || m_nPedType == 3; }
+ bool IsPlayer(void);
bool UseGroundColModel(void);
void AddWeaponModel(int id);
void AimGun();
void KillPedWithCar(CVehicle *veh, float impulse);
void Say(uint16 audio);
- void SetLookFlag(CPed *to, bool set);
- void SetLookFlag(float angle, bool set);
+ void SetLookFlag(CPed *target, bool unknown);
+ void SetLookFlag(float direction, bool unknown);
void SetLookTimer(int time);
void SetDie(AnimationId anim, float arg1, float arg2);
void ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer);
void RemoveBodyPart(PedNode nodeId, int8 unknown);
void SpawnFlyingComponent(int, int8 unknown);
- bool OurPedCanSeeThisOne(CEntity* who);
+ bool OurPedCanSeeThisOne(CEntity *target);
void Avoid(void);
static RwObject *SetPedAtomicVisibilityCB(RwObject *object, void *data);
static RwFrame *RecurseFrameChildrenVisibilityCB(RwFrame *frame, void *data);