summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-08-14 18:42:15 +0200
committerSergeanur <s.anureev@yandex.ua>2020-08-14 18:42:15 +0200
commit72088a000b6fc0d641f5b94f6aa6586e9e2d9e8b (patch)
tree0368af537e41ca08e828a18bbd738da7dd208911 /src
parentOriginal screen grabber (diff)
downloadre3-72088a000b6fc0d641f5b94f6aa6586e9e2d9e8b.tar
re3-72088a000b6fc0d641f5b94f6aa6586e9e2d9e8b.tar.gz
re3-72088a000b6fc0d641f5b94f6aa6586e9e2d9e8b.tar.bz2
re3-72088a000b6fc0d641f5b94f6aa6586e9e2d9e8b.tar.lz
re3-72088a000b6fc0d641f5b94f6aa6586e9e2d9e8b.tar.xz
re3-72088a000b6fc0d641f5b94f6aa6586e9e2d9e8b.tar.zst
re3-72088a000b6fc0d641f5b94f6aa6586e9e2d9e8b.zip
Diffstat (limited to 'src')
-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();