From e5f6f7d9acbc35795cb20cbd7e09bd6e45afd6b9 Mon Sep 17 00:00:00 2001
From: Night Owl <sepulkarium45@yahoo.com>
Date: Wed, 5 Jul 2017 16:58:26 +0500
Subject: [PATCH] Merge
 https://github.com/SamVanheer/HLEnhanced/commit/0cbbe099f3170170d41683c2a4288d1f06aad048

---
 dlls/shotgun.cpp | 17 ++++++++++-------
 dlls/weapons.h   |  1 +
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dlls/shotgun.cpp b/dlls/shotgun.cpp
index d6be007a..12e73ede 100644
--- a/dlls/shotgun.cpp
+++ b/dlls/shotgun.cpp
@@ -169,7 +169,7 @@ void CShotgun::PrimaryAttack()
 		// HEV suit - indicate out of ammo condition
 		m_pPlayer->SetSuitUpdate( "!HEV_AMO0", FALSE, 0 );
 
-	if( m_iClip != 0 )
+	//if( m_iClip != 0 )
 		m_flPumpTime = gpGlobals->time + 0.5;
 
 	m_flNextPrimaryAttack = GetNextAttackDelay( 0.75 );
@@ -240,7 +240,7 @@ void CShotgun::SecondaryAttack( void )
 		// HEV suit - indicate out of ammo condition
 		m_pPlayer->SetSuitUpdate( "!HEV_AMO0", FALSE, 0 );
 
-	if( m_iClip != 0 )
+	//if( m_iClip != 0 )
 		m_flPumpTime = gpGlobals->time + 0.95;
 
 	m_flNextPrimaryAttack = GetNextAttackDelay( 1.5 );
@@ -299,18 +299,21 @@ void CShotgun::Reload( void )
 	}
 }
 
-void CShotgun::WeaponIdle( void )
+void CShotgun::WeaponTick()
 {
-	ResetEmptySound();
-
-	m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
-
 	if( m_flPumpTime && m_flPumpTime < gpGlobals->time )
 	{
 		// play pumping sound
 		EMIT_SOUND_DYN( ENT( m_pPlayer->pev ), CHAN_ITEM, "weapons/scock1.wav", 1, ATTN_NORM, 0, 95 + RANDOM_LONG( 0, 0x1f ) );
 		m_flPumpTime = 0;
 	}
+}
+
+void CShotgun::WeaponIdle( void )
+{
+	ResetEmptySound();
+
+	m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
 
 	if( m_flTimeWeaponIdle <  UTIL_WeaponTimeBase() )
 	{
diff --git a/dlls/weapons.h b/dlls/weapons.h
index a7c40678..7d99e8a6 100644
--- a/dlls/weapons.h
+++ b/dlls/weapons.h
@@ -632,6 +632,7 @@ public:
 	void SecondaryAttack( void );
 	BOOL Deploy( );
 	void Reload( void );
+	void WeaponTick();
 	void WeaponIdle( void );
 	int m_fInReload;
 	float m_flNextReload;