summaryrefslogtreecommitdiffstats
path: root/src/peds/PedFight.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-12-26 09:04:26 +0100
committerSergeanur <s.anureev@yandex.ua>2020-12-26 09:04:26 +0100
commit99a3fe0a13c56710739c41f6e3595c982af92c2d (patch)
tree2aa4cd6cda66a4c6e41b4b8e347dc1dc8ee087a8 /src/peds/PedFight.cpp
parentcPedParams ctor (diff)
downloadre3-99a3fe0a13c56710739c41f6e3595c982af92c2d.tar
re3-99a3fe0a13c56710739c41f6e3595c982af92c2d.tar.gz
re3-99a3fe0a13c56710739c41f6e3595c982af92c2d.tar.bz2
re3-99a3fe0a13c56710739c41f6e3595c982af92c2d.tar.lz
re3-99a3fe0a13c56710739c41f6e3595c982af92c2d.tar.xz
re3-99a3fe0a13c56710739c41f6e3595c982af92c2d.tar.zst
re3-99a3fe0a13c56710739c41f6e3595c982af92c2d.zip
Diffstat (limited to 'src/peds/PedFight.cpp')
-rw-r--r--src/peds/PedFight.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp
index 151d3806..25ca2210 100644
--- a/src/peds/PedFight.cpp
+++ b/src/peds/PedFight.cpp
@@ -821,7 +821,7 @@ CPed::Attack(void)
}
}
- float animStart = ourWeapon->m_fAnimLoopStart * 0.4f;
+ float animStart = animLoopStart * 0.4f;
weaponAnimTime = weaponAnimAssoc->currentTime;
if (weaponAnimTime > animStart && weaponAnimTime - weaponAnimAssoc->timeStep <= animStart) {
if (!bIsDucking && !(m_nPedType == PEDTYPE_COP && ourWeapon->m_bCop3rd && weaponAnimAssoc->animId == ANIM_WEAPON_FIRE_3RD) && ourWeapon->m_bCanAimWithArm)
@@ -843,7 +843,7 @@ CPed::Attack(void)
} else {
firePos = ourWeapon->m_vecFireOffset;
- if (ourWeaponType != WEAPONTYPE_KATANA && ourWeaponType != WEAPONTYPE_CHAINSAW) {
+ if(ourWeapon->m_AnimToPlay != ASSOCGRP_BASEBALLBAT && ourWeapon->m_AnimToPlay != ASSOCGRP_GOLFCLUB) {
if (ourWeapon->m_eWeaponFire != WEAPON_FIRE_MELEE) {
TransformToNode(firePos, (weaponAnimAssoc->animId == ANIM_MELEE_ATTACK_2ND && ourWeapon->m_AnimToPlay == ASSOCGRP_UNARMED) ? PED_FOOTR : PED_HANDR);
} else {