From 1f584d72374b79b3c888841ea14ab3f992a04cbe Mon Sep 17 00:00:00 2001 From: Roman Chistokhodov Date: Mon, 8 Jul 2019 21:20:14 +0300 Subject: [PATCH 1/2] Fix crowbar delay after the first hit --- dlls/crowbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crowbar.cpp b/dlls/crowbar.cpp index 8a0ba9a3..735b47ff 100644 --- a/dlls/crowbar.cpp +++ b/dlls/crowbar.cpp @@ -330,7 +330,7 @@ int CCrowbar::Swing( int fFirst ) SetThink( &CCrowbar::Smack ); pev->nextthink = UTIL_WeaponTimeBase() + 0.2; #endif - m_flNextPrimaryAttack = GetNextAttackDelay( 0.25 ); + m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25; } #ifdef CROWBAR_IDLE_ANIM m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); From c96794aa2dfd3120b8a133555c7192a9e527edc1 Mon Sep 17 00:00:00 2001 From: Roman Chistokhodov Date: Wed, 16 Oct 2019 01:51:48 +0300 Subject: [PATCH 2/2] Place crowbar delay fix under a macro --- dlls/crowbar.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/crowbar.cpp b/dlls/crowbar.cpp index 735b47ff..66d8266e 100644 --- a/dlls/crowbar.cpp +++ b/dlls/crowbar.cpp @@ -330,7 +330,11 @@ int CCrowbar::Swing( int fFirst ) SetThink( &CCrowbar::Smack ); pev->nextthink = UTIL_WeaponTimeBase() + 0.2; #endif +#if CROWBAR_DELAY_FIX m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25; +#else + m_flNextPrimaryAttack = GetNextAttackDelay( 0.25 ); +#endif } #ifdef CROWBAR_IDLE_ANIM m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );