diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-05-19 16:46:18 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-05-19 16:46:18 +0200 |
| commit | 99574ebfc61a79b34f4681eaa2debefbae174875 (patch) | |
| tree | a3edae2913a4af9682f7ecfec53367a484c2975c /src/peds/Ped.cpp | |
| parent | Melee weapons(half-working), Ped and Hud bits (diff) | |
| parent | Merge pull request #564 from Xinerki/miami (diff) | |
| download | re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.gz re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.bz2 re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.lz re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.xz re3-99574ebfc61a79b34f4681eaa2debefbae174875.tar.zst re3-99574ebfc61a79b34f4681eaa2debefbae174875.zip | |
Diffstat (limited to 'src/peds/Ped.cpp')
| -rw-r--r-- | src/peds/Ped.cpp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 2e5898f6..15c72330 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -513,6 +513,8 @@ CPed::CPed(uint32 pedType) : m_pedIK(this) m_fAirResistance = 0.4f / m_fMass; m_fElasticity = 0.05f; + m_ceaseAttackTimer = 0; + bIsStanding = false; bWasStanding = false; bIsAttacking = false; @@ -18604,4 +18606,29 @@ bool CPed::CanBeDamagedByThisGangMember(CPed* who) { return m_gangFlags & (1 << (uint8)(who->m_nPedType - PEDTYPE_GANG1)); +} + +bool +IsPedPointerValid_NotInWorld(CPed* pPed) +{ + if (!pPed) + return false; + int index = CPools::GetPedPool()->GetJustIndex(pPed); +#ifdef FIX_BUGS + if (index < 0 || index >= NUMPEDS) +#else + if (index < 0 || index > NUMPEDS) +#endif + return false; + return true; +} + +bool +IsPedPointerValid(CPed* pPed) +{ + if (!IsPedPointerValid_NotInWorld(pPed)) + return false; + if (pPed->bInVehicle && pPed->m_pMyVehicle) + return IsEntityPointerValid(pPed->m_pMyVehicle); + return pPed->m_entryInfoList.first || pPed == FindPlayerPed(); }
\ No newline at end of file |