Skip to content

Commit

Permalink
Revert "Disallowed switching to second knife hit when first is active"
Browse files Browse the repository at this point in the history
This reverts commit b52042b.
  • Loading branch information
Xottab-DUTY committed Apr 2, 2019
1 parent 971dc87 commit 25238f2
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions cs/engine/xrGame/WeaponKnife.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ void CWeaponKnife::OnStateSwitch (u32 S)
}break;
case eFire2:
{
if (GetState() != eFire)
break;
//-------------------------------------------
m_eHitType = m_eHitType_2;
//fHitPower = fHitPower_2;
Expand Down Expand Up @@ -193,7 +191,7 @@ void CWeaponKnife::switch2_Attacking (u32 state)

if(state==eFire)
PlayHUDMotion("anm_attack", FALSE, this, state);
else if (GetState() != eFire) // eFire2
else //eFire2
PlayHUDMotion("anm_attack2", FALSE, this, state);

SetPending (TRUE);
Expand Down Expand Up @@ -235,8 +233,7 @@ void CWeaponKnife::FireStart()

void CWeaponKnife::Fire2Start ()
{
if (GetState() != eFire)
SwitchState(eFire2);
SwitchState(eFire2);
}


Expand Down

0 comments on commit 25238f2

Please sign in to comment.