summaryrefslogtreecommitdiffstats
path: root/src/peds/Ped.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-08-18 11:09:50 +0200
committeraap <aap@papnet.eu>2020-08-18 11:09:50 +0200
commite3405f4be4369c98f874a2d477bd6567f1be9381 (patch)
tree1cdaa079fcb6a6da55d6d5126594b2a1a94bf76d /src/peds/Ped.cpp
parentupdate librw (diff)
parentremove CFO (diff)
downloadre3-e3405f4be4369c98f874a2d477bd6567f1be9381.tar
re3-e3405f4be4369c98f874a2d477bd6567f1be9381.tar.gz
re3-e3405f4be4369c98f874a2d477bd6567f1be9381.tar.bz2
re3-e3405f4be4369c98f874a2d477bd6567f1be9381.tar.lz
re3-e3405f4be4369c98f874a2d477bd6567f1be9381.tar.xz
re3-e3405f4be4369c98f874a2d477bd6567f1be9381.tar.zst
re3-e3405f4be4369c98f874a2d477bd6567f1be9381.zip
Diffstat (limited to 'src/peds/Ped.cpp')
-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();