From 780b4616fe420f3d9ab24d68bcc51ab172e4b1d0 Mon Sep 17 00:00:00 2001
From: Night Owl <sepulkarium45@yahoo.com>
Date: Wed, 5 Jul 2017 02:41:23 +0500
Subject: [PATCH] Merge
 https://github.com/SamVanheer/HLEnhanced/commit/c98747a35e324dca2d88c13036f1f74947caba96

---
 dlls/rpg.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp
index fb2b39c8..021ad534 100644
--- a/dlls/rpg.cpp
+++ b/dlls/rpg.cpp
@@ -460,6 +460,8 @@ void CRpg::PrimaryAttack()
 
 		m_flNextPrimaryAttack = GetNextAttackDelay( 1.5 );
 		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.5;
+
+		ResetEmptySound();
 	}
 	else
 	{
@@ -487,13 +489,13 @@ void CRpg::WeaponIdle( void )
 {
 	UpdateSpot();
 
-	ResetEmptySound();
-
 	if( m_flTimeWeaponIdle > UTIL_WeaponTimeBase() )
 		return;
 
 	if( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] )
 	{
+		ResetEmptySound();
+
 		int iAnim;
 		float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0, 1 );
 		if( flRand <= 0.75 || m_fSpotActive )