Merge 4dfa6b8710

8 years ago · 33ba064b88
2 changed files with 6 additions and 5 deletions
--- a/cl_dll/ev_hldm.cpp
+++ b/cl_dll/ev_hldm.cpp
@ -1159,8 +1159,6 @@ void EV_Crowbar( event_args_t *args )
				@@ -1159,8 +1159,6 @@ void EV_Crowbar( event_args_t *args )

 	if( EV_IsLocal( idx ) )
 	{
-		gEngfuncs.pEventAPI->EV_WeaponAnimation( CROWBAR_ATTACK1MISS, 1 );
-
 		switch( (g_iSwing++) % 3 )
 		{
 			case 0:
--- a/dlls/crowbar.cpp
+++ b/dlls/crowbar.cpp
@ -183,9 +183,12 @@ int CCrowbar::Swing( int fFirst )
				@@ -183,9 +183,12 @@ int CCrowbar::Swing( int fFirst )
 		}
 	}
 #endif
-	PLAYBACK_EVENT_FULL( FEV_NOTHOST, m_pPlayer->edict(), m_usCrowbar, 
-	0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0, 0, 0,
-	0, 0, 0 );
+	if( fFirst )
+	{
+		PLAYBACK_EVENT_FULL( FEV_NOTHOST, m_pPlayer->edict(), m_usCrowbar, 
+		0.0, (float *)&g_vecZero, (float *)&g_vecZero, 0, 0, 0,
+		0, 0, 0 );
+	}

 	if( tr.flFraction >= 1.0 )
 	{