diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-07-22 21:15:27 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-07-22 21:15:27 +0200 |
| commit | aec797671e7ae079556d7629dafa159b1431364d (patch) | |
| tree | eb8158591c2e7e448c94a1cf39ba024759eddea3 | |
| parent | Possible fix of RemoveAndAdd crash (diff) | |
| download | re3-aec797671e7ae079556d7629dafa159b1431364d.tar re3-aec797671e7ae079556d7629dafa159b1431364d.tar.gz re3-aec797671e7ae079556d7629dafa159b1431364d.tar.bz2 re3-aec797671e7ae079556d7629dafa159b1431364d.tar.lz re3-aec797671e7ae079556d7629dafa159b1431364d.tar.xz re3-aec797671e7ae079556d7629dafa159b1431364d.tar.zst re3-aec797671e7ae079556d7629dafa159b1431364d.zip | |
| -rw-r--r-- | src/control/Script5.cpp | 2 | ||||
| -rw-r--r-- | src/peds/PedFight.cpp | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp index 25b29256..f65724c2 100644 --- a/src/control/Script5.cpp +++ b/src/control/Script5.cpp @@ -1913,7 +1913,7 @@ bool CRunningScript::CheckDamagedWeaponType(int32 actual, int32 type) if (type == WEAPONTYPE_ANYMELEE) { if (actual <= WEAPONTYPE_CHAINSAW) return true; - if (actual - WEAPONTYPE_GRENADE <= WEAPONTYPE_MINIGUN) + if (actual >= WEAPONTYPE_GRENADE && actual <= WEAPONTYPE_UNIDENTIFIED) return false; return false; } diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp index 8e377c81..20df6553 100644 --- a/src/peds/PedFight.cpp +++ b/src/peds/PedFight.cpp @@ -352,6 +352,14 @@ CPed::SetAttack(CEntity *victim) SetAimFlag(m_fRotationCur); } } +#ifdef FIX_BUGS + // fix aiming for flamethrower and minigun while using PC controls + else if (curWeapon->m_AnimToPlay == ASSOCGRP_FLAMETHROWER && TheCamera.Cams[0].Using3rdPersonMouseCam() && this == FindPlayerPed()) + { + SetAimFlag(m_fRotationCur); + ((CPlayerPed*)this)->m_fFPSMoveHeading = TheCamera.Find3rdPersonQuickAimPitch(); + } +#endif if (m_nPedState == PED_ATTACK) { bIsAttacking = true; return; |