From 5f8afd6e790dcf3cf2544367f185084b6bd98332 Mon Sep 17 00:00:00 2001 From: Roman Chistokhodov Date: Tue, 29 Oct 2019 04:53:57 +0300 Subject: [PATCH] Enable more crowbar fixes for Blue Shift --- cl_dll/CMakeLists.txt | 2 +- dlls/CMakeLists.txt | 2 +- dlls/crowbar.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cl_dll/CMakeLists.txt b/cl_dll/CMakeLists.txt index ff57dd24..3ca67a90 100644 --- a/cl_dll/CMakeLists.txt +++ b/cl_dll/CMakeLists.txt @@ -25,7 +25,7 @@ project (CLDLL) set (CLDLL_LIBRARY client) -add_definitions(-DCLIENT_WEAPONS -DCLIENT_DLL -DCROWBAR_IDLE_ANIM) +add_definitions(-DCLIENT_WEAPONS -DCLIENT_DLL -DCROWBAR_IDLE_ANIM -DCROWBAR_FIX_RAPID_CROWBAR -DCROWBAR_DELAY_FIX) if(NOT MSVC) add_compile_options(-fno-exceptions) # GCC/Clang flag diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt index 7d13d5f3..6bee15ea 100644 --- a/dlls/CMakeLists.txt +++ b/dlls/CMakeLists.txt @@ -25,7 +25,7 @@ project (SVDLL) set (SVDLL_LIBRARY server) -add_definitions(-DCLIENT_WEAPONS -DCROWBAR_IDLE_ANIM) +add_definitions(-DCLIENT_WEAPONS -DCROWBAR_IDLE_ANIM -DCROWBAR_FIX_RAPID_CROWBAR -DCROWBAR_DELAY_FIX) if(NOT MSVC) add_compile_options(-fno-exceptions) # GCC/Clang flag diff --git a/dlls/crowbar.cpp b/dlls/crowbar.cpp index bb7d1e38..acfa0674 100644 --- a/dlls/crowbar.cpp +++ b/dlls/crowbar.cpp @@ -335,7 +335,7 @@ int CCrowbar::Swing( int fFirst ) SetThink( &CCrowbar::Smack ); pev->nextthink = UTIL_WeaponTimeBase() + 0.2; #endif -#if CROWBAR_DELAY_FIX +#ifdef CROWBAR_DELAY_FIX m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25; #else m_flNextPrimaryAttack = GetNextAttackDelay( 0.25 );