diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-18 20:19:30 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-18 20:19:30 +0100 |
| commit | c09297997e9878f06e6cd513e26cbbe50ae860fb (patch) | |
| tree | 810b97cfd49a9c3b43a3a3f1803d2e04f9c87ce9 /src/peds | |
| parent | Merge branch 'lcs' into lcs-dev (diff) | |
| download | re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.gz re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.bz2 re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.lz re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.xz re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.zst re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Ped.h | 11 | ||||
| -rw-r--r-- | src/peds/PedAI.cpp | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h index 9c77b596..1acd571b 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -527,7 +527,7 @@ public: uint32 bOnlyAllowedToSitInFront : 1; uint32 b1A1_8 : 1; uint32 b1A1_10 : 1; - uint32 b1A1_20 : 1; + uint32 bOverrideMoveAnim : 1; #ifdef KANGAROO_CHEAT // our own flags @@ -536,16 +536,16 @@ public: uint16 m_gangFlags; // <- this one is uint16 - uint8 b1A4_1 : 1; + uint8 bDropsWeaponsOnDeath : 1; uint8 b1A4_2 : 1; - uint8 b1A4_4 : 1; + uint8 bAttacksPlayerWithCops : 1; uint8 b1A4_8 : 1; uint8 b1A4_10 : 1; uint8 b1A4_20 : 1; uint8 b1A4_40 : 1; uint8 b1A4_80 : 1; - uint8 b1A5_1 : 1; + uint8 bCanBeTargettedByLeader : 1; uint8 b1A5_2 : 1; uint8 b1A5_4 : 1; uint8 b1A5_8 : 1; @@ -605,6 +605,8 @@ public: float m_fHealth; float m_fArmour; uint32 m_nExtendedRangeTimer; + uint32 m_nScriptShootTimer; + uint32 m_nScriptAttackTimer; int16 m_routeLastPoint; uint16 m_routeStartPoint; int16 m_routePointsPassed; @@ -704,6 +706,7 @@ public: uint32 m_lastComment; CVector m_vecSpotToGuard; float m_radiusToGuard; + float m_fMaxHealth; static void *operator new(size_t); static void *operator new(size_t, int); diff --git a/src/peds/PedAI.cpp b/src/peds/PedAI.cpp index a28ded8c..b945cf9b 100644 --- a/src/peds/PedAI.cpp +++ b/src/peds/PedAI.cpp @@ -6488,7 +6488,7 @@ CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWith } } if (m_pedInObjective->IsPlayer() && m_nPedType != PEDTYPE_COP - && CharCreatedBy != MISSION_CHAR && FindPlayerPed()->m_pWanted->m_CurrentCops != 0) { + && CharCreatedBy != MISSION_CHAR && FindPlayerPed()->m_pWanted->m_CurrentCops != 0/* TODO: && !bAttacksPlayerWithCops*/) { SetObjective(OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE); return CANT_ATTACK; |