diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-19 19:54:05 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-19 19:54:05 +0200 |
| commit | 4c822e8375268ac34f92af3f1960965446d32506 (patch) | |
| tree | 50c0d7d8c2514880f9148a2edc655954eb500191 /src/peds/Ped.h | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-4c822e8375268ac34f92af3f1960965446d32506.tar re3-4c822e8375268ac34f92af3f1960965446d32506.tar.gz re3-4c822e8375268ac34f92af3f1960965446d32506.tar.bz2 re3-4c822e8375268ac34f92af3f1960965446d32506.tar.lz re3-4c822e8375268ac34f92af3f1960965446d32506.tar.xz re3-4c822e8375268ac34f92af3f1960965446d32506.tar.zst re3-4c822e8375268ac34f92af3f1960965446d32506.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/peds/Ped.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h index 1fa36b05..f34de765 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -418,9 +418,6 @@ public: uint32 bVehExitWillBeInstant : 1; uint32 bHasAlreadyBeenRecorded : 1; uint32 bFallenDown : 1; -#ifdef VC_PED_PORTS - uint32 bSomeVCflag1 : 1; -#endif #ifdef PED_SKIN uint32 bDontAcceptIKLookAts : 1; // TODO: find uses of this #endif @@ -433,6 +430,10 @@ public: uint32 bHasAlreadyUsedAttractor : 1; // 0x155 0x1 uint32 bCarPassenger : 1; // 0x155 0x4 uint32 bMiamiViceCop : 1; // 0x155 0x20 + uint32 bIsPlayerFriend : 1; // 0x156 0x10 +#ifdef VC_PED_PORTS + uint32 bHeadStuckInCollision : 1; // 0x156 0x20 +#endif uint32 bDeadPedInFrontOfCar : 1; // 0x156 0x40 uint8 CharCreatedBy; @@ -666,7 +667,9 @@ public: void SetPointGunAt(CEntity*); bool Seek(void); bool SetWanderPath(int8); - bool SetFollowPath(CVector); + bool SetFollowPath(CVector dest, float radius, eMoveState state, CEntity*, CEntity*, int); + bool SetFollowPathStatic(void); + bool SetFollowPathDynamic(void); void ClearAttackByRemovingAnim(void); void SetStoredState(void); void StopNonPartialAnims(void); @@ -873,7 +876,12 @@ public: CWeapon *GetWeapon(void) { return &m_weapons[m_currentWeapon]; } PedState GetPedState(void) { return m_nPedState; } - void SetPedState(PedState state) { m_nPedState = state; } + void SetPedState(PedState state) + { + if (GetPedState() == PED_FOLLOW_PATH) + ClearFollowPath(); + m_nPedState = state; + } bool Dead(void) { return m_nPedState == PED_DEAD; } bool Dying(void) { return m_nPedState == PED_DIE; } bool DyingOrDead(void) { return m_nPedState == PED_DIE || m_nPedState == PED_DEAD; } |