From 33ba064b88d9b0e818009049aef13f53bd16ae20 Mon Sep 17 00:00:00 2001
From: Night Owl <sepulkarium45@yahoo.com>
Date: Wed, 5 Jul 2017 17:53:04 +0500
Subject: [PATCH] Merge
 https://github.com/SamVanheer/HLEnhanced/commit/4dfa6b8710a0a30761b298a02bee21c65f056327

---
 cl_dll/ev_hldm.cpp | 2 --
 dlls/crowbar.cpp   | 9 ++++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cl_dll/ev_hldm.cpp b/cl_dll/ev_hldm.cpp
index 381c9179..7d2464e8 100644
--- a/cl_dll/ev_hldm.cpp
+++ b/cl_dll/ev_hldm.cpp
@@ -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:
diff --git a/dlls/crowbar.cpp b/dlls/crowbar.cpp
index 65e21162..98808e14 100644
--- a/dlls/crowbar.cpp
+++ b/dlls/crowbar.cpp
@@ -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 )
 	{