summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-08-15 17:56:52 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-08-15 17:56:52 +0200
commit1d5e3c74256038c763bbe8d1369715bc47f99dd8 (patch)
treeee2a1dac538b95ddb92d7744a6821917e7dd3056 /src/peds
parentsubmodules (diff)
parentDon't react if player's targeting with melee (diff)
downloadre3-1d5e3c74256038c763bbe8d1369715bc47f99dd8.tar
re3-1d5e3c74256038c763bbe8d1369715bc47f99dd8.tar.gz
re3-1d5e3c74256038c763bbe8d1369715bc47f99dd8.tar.bz2
re3-1d5e3c74256038c763bbe8d1369715bc47f99dd8.tar.lz
re3-1d5e3c74256038c763bbe8d1369715bc47f99dd8.tar.xz
re3-1d5e3c74256038c763bbe8d1369715bc47f99dd8.tar.zst
re3-1d5e3c74256038c763bbe8d1369715bc47f99dd8.zip
Diffstat (limited to '')
-rw-r--r--src/peds/Ped.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index f52b373e..a15927ff 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -10232,7 +10232,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();