diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-08-15 14:13:46 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-08-15 14:13:46 +0200 |
| commit | 9956b277674563015816e1695f05c6bc4a507fda (patch) | |
| tree | e0b513c635c57e74aca0346c0bab5eba748f1186 /src/peds | |
| parent | Merge pull request #686 from erorcun/miami (diff) | |
| parent | Don't react if player's targeting with melee (diff) | |
| download | re3-9956b277674563015816e1695f05c6bc4a507fda.tar re3-9956b277674563015816e1695f05c6bc4a507fda.tar.gz re3-9956b277674563015816e1695f05c6bc4a507fda.tar.bz2 re3-9956b277674563015816e1695f05c6bc4a507fda.tar.lz re3-9956b277674563015816e1695f05c6bc4a507fda.tar.xz re3-9956b277674563015816e1695f05c6bc4a507fda.tar.zst re3-9956b277674563015816e1695f05c6bc4a507fda.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Ped.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index d009579c..303c0cbc 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -11810,7 +11810,11 @@ CPed::ProcessControl(void) CPed::Chat(); break; case PED_AIM_GUN: - if (m_pPointGunAt && m_pPointGunAt->IsPed() && ((CPed*)m_pPointGunAt)->CanSeeEntity(this, CAN_SEE_ENTITY_ANGLE_THRESHOLD * 2)) { + if (m_pPointGunAt && m_pPointGunAt->IsPed() +#ifdef FIX_BUGS + && !GetWeapon()->IsTypeMelee() +#endif + && ((CPed*)m_pPointGunAt)->CanSeeEntity(this, CAN_SEE_ENTITY_ANGLE_THRESHOLD * 2)) { ((CPed*)m_pPointGunAt)->ReactToPointGun(this); } PointGunAt(); |