From 88f5775189766ffc1aa2dcec421dde7868ea849d Mon Sep 17 00:00:00 2001 From: v2v3v4 Date: Fri, 5 Apr 2019 21:15:51 +0500 Subject: [PATCH] Disallowed switching to second knife hit when first is active --- cs/engine/xrGame/WeaponKnife.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cs/engine/xrGame/WeaponKnife.cpp b/cs/engine/xrGame/WeaponKnife.cpp index ebaf8b6b2..11e0d820e 100644 --- a/cs/engine/xrGame/WeaponKnife.cpp +++ b/cs/engine/xrGame/WeaponKnife.cpp @@ -84,6 +84,7 @@ void CWeaponKnife::OnStateSwitch (u32 S) }break; case eFire2: { + if(GetState() == eFire) return;//v2v3v4 фикс 2й атаки //------------------------------------------- m_eHitType = m_eHitType_2; //fHitPower = fHitPower_2; @@ -191,7 +192,7 @@ void CWeaponKnife::switch2_Attacking (u32 state) if(state==eFire) PlayHUDMotion("anm_attack", FALSE, this, state); - else //eFire2 + else if(GetState() != eFire && state==eFire2)//v2v3v4 фикс 2й атаки PlayHUDMotion("anm_attack2", FALSE, this, state); SetPending (TRUE); @@ -233,6 +234,7 @@ void CWeaponKnife::FireStart() void CWeaponKnife::Fire2Start () { + if(GetState() != eFire)//v2v3v4 фикс 2й атаки SwitchState(eFire2); }