From 543e3912233b6fa9f4dd105972ef2d6b26fd27ad Mon Sep 17 00:00:00 2001
From: Roman Chistokhodov <freeslave93@gmail.com>
Date: Mon, 8 Aug 2022 02:29:33 +0300
Subject: [PATCH 1/2] Sync shotgun.cpp with master (#313)

---
 dlls/shotgun.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/shotgun.cpp b/dlls/shotgun.cpp
index 881f784d..7b263a21 100644
--- a/dlls/shotgun.cpp
+++ b/dlls/shotgun.cpp
@@ -177,7 +177,6 @@ void CShotgun::PrimaryAttack()
 
 	m_flNextPrimaryAttack = GetNextAttackDelay( 0.75f );
 	m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 0.75f;
-	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.75;
 	if( m_iClip != 0 )
 		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 5.0f;
 	else
@@ -249,7 +248,6 @@ void CShotgun::SecondaryAttack( void )
 
 	m_flNextPrimaryAttack = GetNextAttackDelay( 1.5f );
 	m_flNextSecondaryAttack = UTIL_WeaponTimeBase() + 1.5f;
-	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 1.5;
 	if( m_iClip != 0 )
 		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 6.0f;
 	else

From 778d4b11aff0b970255d43dd4e06fc6f319ba8c6 Mon Sep 17 00:00:00 2001
From: Roman Chistokhodov <freeslave93@gmail.com>
Date: Mon, 8 Aug 2022 03:00:07 +0300
Subject: [PATCH 2/2] Apply crowbar fixes to knife (#314)

---
 dlls/gearbox/knife.cpp | 43 ++++++++++++++++++++++++++++++++++++++++--
 dlls/weapons.h         |  3 +++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/dlls/gearbox/knife.cpp b/dlls/gearbox/knife.cpp
index 9c76ebed..fd0b959b 100644
--- a/dlls/gearbox/knife.cpp
+++ b/dlls/gearbox/knife.cpp
@@ -164,7 +164,9 @@ int CKnife::Swing(int fFirst)
 		{
 			// miss
 			m_flNextPrimaryAttack = GetNextAttackDelay(0.5);
-
+#if CROWBAR_IDLE_ANIM
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+#endif
 			// player "shoot" animation
 			m_pPlayer->SetAnimation(PLAYER_ATTACK1);
 		}
@@ -276,7 +278,44 @@ int CKnife::Swing(int fFirst)
 		SetThink(&CKnife::Smack);
 		pev->nextthink = UTIL_WeaponTimeBase() + 0.2;
 #endif
-		m_flNextPrimaryAttack = GetNextAttackDelay(0.25);
+#if CROWBAR_DELAY_FIX
+		m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25f;
+#else
+		m_flNextPrimaryAttack = GetNextAttackDelay( 0.25f );
+#endif
 	}
+#if CROWBAR_IDLE_ANIM
+	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
+#endif
 	return fDidHit;
 }
+
+#if CROWBAR_IDLE_ANIM
+void CKnife::WeaponIdle( void )
+{
+	if( m_flTimeWeaponIdle < UTIL_WeaponTimeBase() )
+	{
+		int iAnim;
+		float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0, 1 );
+		if( flRand > 0.9f )
+		{
+			iAnim = KNIFE_IDLE2;
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 160.0f / 30.0f;
+		}
+		else
+		{
+			if( flRand > 0.5f )
+			{
+				iAnim = KNIFE_IDLE1;
+				m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 70.0f / 25.0f;
+			}
+			else
+			{
+				iAnim = KNIFE_IDLE3;
+				m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 160.0f / 30.0f;
+			}
+		}
+		SendWeaponAnim( iAnim );
+	}
+}
+#endif
diff --git a/dlls/weapons.h b/dlls/weapons.h
index ff6a2a57..f09c904d 100644
--- a/dlls/weapons.h
+++ b/dlls/weapons.h
@@ -1210,6 +1210,9 @@ public:
 	int Swing(int fFirst);
 	BOOL Deploy(void);
 	void Holster(int skiplocal = 0);
+#if CROWBAR_IDLE_ANIM
+	void WeaponIdle();
+#endif
 	int m_iSwing;
 	TraceResult m_trHit;