diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-14 00:44:48 +0300 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-14 00:44:48 +0300 |
commit | f93285df7960b75f616d9bbdb364e113714151ee (patch) | |
tree | afa425c6f56716ff4d610e2ed9497996c1fe9d06 /src/peds/Ped.h | |
parent | 2411558bab50929cbc067c9f4083f24ad1af65c9 (diff) | |
parent | 94b389ee16e194546754bc65bb92a6e256bd6062 (diff) |
Merge remote-tracking branch 'upstream/master' into script_dev
Diffstat (limited to 'src/peds/Ped.h')
-rw-r--r-- | src/peds/Ped.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h index fb397b38..7a0ade14 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -478,7 +478,7 @@ public: int32 m_bloodyFootprintCount; uint8 m_panicCounter; bool m_deadBleeding; - int8 m_bodyPartBleeding; // PedNode + int8 m_bodyPartBleeding; // PedNode, but -1 if there isn't uint8 m_field_4F3; CPed *m_nearPeds[10]; uint16 m_numNearPeds; @@ -576,7 +576,7 @@ public: void SetPointGunAt(CEntity*); bool Seek(void); bool SetWanderPath(int8); - void SetFollowPath(CVector); + bool SetFollowPath(CVector); void ClearAttackByRemovingAnim(void); void SetStoredState(void); void StopNonPartialAnims(void); @@ -677,6 +677,7 @@ public: bool WillChat(CPed*); void SetEnterTrain(CVehicle*, uint32); void SetEnterCar_AllClear(CVehicle*, uint32, uint32); + void SetSolicit(uint32 time); // Static methods static CVector GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset); |