From efe13c3d0419db6427c31a07164c8541cfe77c08 Mon Sep 17 00:00:00 2001 From: Agent Agrimar Date: Sun, 13 Sep 2020 05:58:45 -0400 Subject: [PATCH 1/7] client: wscript: add winmm.lib dependency This fixes a linker error when compiling for win32 with Goldsrc Support enabled. --- cl_dll/wscript | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/cl_dll/wscript b/cl_dll/wscript index f02742b7..07dabf08 100644 --- a/cl_dll/wscript +++ b/cl_dll/wscript @@ -10,12 +10,15 @@ def options(opt): return def configure(conf): - if conf.env.GOLDSRC and conf.env.DEST_OS != 'win32': - conf.check_cc(lib='dl') - if conf.env.DEST_OS == 'win32': conf.check_cxx(lib='user32') + if conf.env.GOLDSRC: + if conf.env.DEST_OS == 'win32': + conf.check_cxx(lib='winmm') + else: + conf.check_cc(lib='dl') + def build(bld): source = bld.path.parent.ant_glob([ 'pm_shared/*.c' @@ -101,12 +104,15 @@ def build(bld): defines += ['GOLDSOURCE_SUPPORT'] libs = [] - if bld.env.GOLDSRC and bld.env.DEST_OS != 'win32': - libs += ['DL'] - if bld.env.DEST_OS == 'win32': libs += ["USER32"] + if bld.env.GOLDSRC: + if bld.env.DEST_OS == 'win32': + libs += ["WINMM"] + else: + libs += ['DL'] + if bld.env.DEST_OS not in ['android', 'dos']: install_path = os.path.join(bld.env.GAMEDIR, bld.env.CLIENT_DIR) else: From a39583f1ef2c435aa598fb5ce30c4571e1340e20 Mon Sep 17 00:00:00 2001 From: Agent Agrimar Date: Sun, 13 Sep 2020 08:01:53 -0400 Subject: [PATCH 2/7] client: cmake: add winmm.lib dependency This fixes a linker error when compiling for win32 with Goldsrc Support enabled. --- cl_dll/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cl_dll/CMakeLists.txt b/cl_dll/CMakeLists.txt index cde35d14..b7c98330 100644 --- a/cl_dll/CMakeLists.txt +++ b/cl_dll/CMakeLists.txt @@ -132,6 +132,9 @@ endif() if(WIN32) target_link_libraries( ${CLDLL_LIBRARY} user32.lib ) + if (GOLDSOURCE_SUPPORT) + target_link_libraries( ${CLDLL_LIBRARY} winmm.lib ) + endif() endif() set_target_properties (${CLDLL_LIBRARY} PROPERTIES From dbd9b1c698f00bf132d8ddbf51c06a64970eb55c Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 28 Sep 2020 16:21:15 +0300 Subject: [PATCH 3/7] public: build: add ARMv8 32-bit support, in case of someone actually uses it --- cmake/LibraryNaming.cmake | 8 +++++--- public/build.h | 17 +++++++++-------- scripts/waifulib/library_naming.py | 12 +++++++----- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/cmake/LibraryNaming.cmake b/cmake/LibraryNaming.cmake index 22581078..f4e3d4b0 100644 --- a/cmake/LibraryNaming.cmake +++ b/cmake/LibraryNaming.cmake @@ -7,13 +7,13 @@ check_symbol_exists(XASH_AMD64 "build.h" XASH_AMD64) check_symbol_exists(XASH_ANDROID "build.h" XASH_ANDROID) check_symbol_exists(XASH_APPLE "build.h" XASH_APPLE) check_symbol_exists(XASH_ARM "build.h" XASH_ARM) -check_symbol_exists(XASH_ARM64 "build.h" XASH_ARM64) check_symbol_exists(XASH_ARM_HARDFP "build.h" XASH_ARM_HARDFP) check_symbol_exists(XASH_ARM_SOFTFP "build.h" XASH_ARM_SOFTFP) check_symbol_exists(XASH_ARMv4 "build.h" XASH_ARMv4) check_symbol_exists(XASH_ARMv5 "build.h" XASH_ARMv5) check_symbol_exists(XASH_ARMv6 "build.h" XASH_ARMv6) check_symbol_exists(XASH_ARMv7 "build.h" XASH_ARMv7) +check_symbol_exists(XASH_ARMv8 "build.h" XASH_ARMv8) check_symbol_exists(XASH_BIG_ENDIAN "build.h" XASH_BIG_ENDIAN) check_symbol_exists(XASH_BSD "build.h" XASH_BSD) check_symbol_exists(XASH_E2K "build.h" XASH_E2K) @@ -55,11 +55,13 @@ if(XASH_AMD64) set(BUILDARCH "amd64") elseif(XASH_X86) set(BUILDARCH "") -elseif(XASH_ARM64) +elseif(XASH_ARM AND XASH_64BIT) set(BUILDARCH "arm64") elseif(XASH_ARM) set(BUILDARCH "armv") - if(XASH_ARMv7) + if(XASH_ARMv8) + set(BUILDARCH "${BUILDARCH}8_32") + elseif(XASH_ARMv7) set(BUILDARCH "${BUILDARCH}7") elseif(XASH_ARMv6) set(BUILDARCH "${BUILDARCH}6") diff --git a/public/build.h b/public/build.h index a087c22c..043a11cd 100644 --- a/public/build.h +++ b/public/build.h @@ -45,13 +45,13 @@ For more information, please refer to #undef XASH_ANDROID #undef XASH_APPLE #undef XASH_ARM -#undef XASH_ARM64 #undef XASH_ARM_HARDFP #undef XASH_ARM_SOFTFP #undef XASH_ARMv4 #undef XASH_ARMv5 #undef XASH_ARMv6 #undef XASH_ARMv7 +#undef XASH_ARMv8 //#undef XASH_BIG_ENDIAN #undef XASH_BSD #undef XASH_E2K @@ -169,14 +169,13 @@ For more information, please refer to #define XASH_AMD64 1 #elif defined(__i386__) || defined(_X86_) || defined(_M_IX86) #define XASH_X86 1 -#elif defined __aarch64__ +#elif defined __aarch64__ || defined _M_ARM64 #define XASH_64BIT 1 - #define XASH_ARM64 1 + #define XASH_ARM 8 #elif defined __arm__ || defined _M_ARM - #if defined _M_ARM - // msvc can only armv7 ? - #define XASH_ARM 7 - #elif __ARM_ARCH == 7 || __ARM_ARCH_7__ + #if __ARM_ARCH == 8 || __ARM_ARCH_8__ + #define XASH_ARM 8 + #elif __ARM_ARCH == 7 || __ARM_ARCH_7__ || defined _M_ARM // msvc can only armv7 in 32 bit #define XASH_ARM 7 #elif __ARM_ARCH == 6 || __ARM_ARCH_6__ || __ARM_ARCH_6J__ #define XASH_ARM 6 @@ -212,7 +211,9 @@ For more information, please refer to #define XASH_64BIT 1 #endif -#if XASH_ARM == 7 +#if XASH_ARM == 8 + #define XASH_ARMv8 1 +#elif XASH_ARM == 7 #define XASH_ARMv7 1 #elif XASH_ARM == 6 #define XASH_ARMv6 1 diff --git a/scripts/waifulib/library_naming.py b/scripts/waifulib/library_naming.py index 827ef76c..6ee9a725 100644 --- a/scripts/waifulib/library_naming.py +++ b/scripts/waifulib/library_naming.py @@ -25,13 +25,13 @@ DEFINES = [ 'XASH_ANDROID', 'XASH_APPLE', 'XASH_ARM', -'XASH_ARM64', 'XASH_ARM_HARDFP', 'XASH_ARM_SOFTFP', 'XASH_ARMv4', 'XASH_ARMv5', 'XASH_ARMv6', 'XASH_ARMv7', +'XASH_ARMv8', 'XASH_BIG_ENDIAN', 'XASH_BSD', 'XASH_E2K', @@ -61,9 +61,9 @@ def configure(conf): 'fragment': CHECK_SYMBOL_EXISTS_FRAGMENT % (x, x), 'includes': [conf.path.find_node('public/').abspath()], 'define_name': x }, DEFINES ) - + conf.multicheck(*tests, msg = '', mandatory = False, quiet = True) - + # engine/common/build.c if conf.env.XASH_ANDROID: buildos = "android" @@ -87,11 +87,13 @@ def configure(conf): buildarch = "amd64" elif conf.env.XASH_X86: buildarch = "" - elif conf.env.XASH_ARM64: + elif conf.env.XASH_ARM and conf.env.XASH_64BIT: buildarch = "arm64" elif conf.env.XASH_ARM: buildarch = "armv" - if conf.env.XASH_ARMv7: + if conf.env.XASH_ARMv8: + buildarch += "8_32" + elif conf.env.XASH_ARMv7: buildarch += "7" elif conf.env.XASH_ARMv6: buildarch += "6" From 4be53d8527eee1d3b56e7f505faba7cefbcb5dac Mon Sep 17 00:00:00 2001 From: Logan Date: Sat, 10 Oct 2020 13:06:04 -0400 Subject: [PATCH 4/7] server: fix monster yaw speed (#137) This makes the yaw speed for all monsters (scientists, headcrabs, etc.) framerate independent. Fix by Solokiller with mikela-valve's adjustments: https://github.com/ValveSoftware/halflife/issues/2458 --- dlls/basemonster.h | 4 ++++ dlls/monsters.cpp | 16 ++++++++++++++++ wscript | 1 + 3 files changed, 21 insertions(+) diff --git a/dlls/basemonster.h b/dlls/basemonster.h index 2234aaf9..48ac9fc9 100644 --- a/dlls/basemonster.h +++ b/dlls/basemonster.h @@ -328,5 +328,9 @@ public: BOOL CineCleanup(); CBaseEntity* DropItem( const char *pszItemName, const Vector &vecPos, const Vector &vecAng );// drop an item. + +#ifdef MONSTER_YAWSPEED_FIX + float m_flLastYawTime; +#endif }; #endif // BASEMONSTER_H diff --git a/dlls/monsters.cpp b/dlls/monsters.cpp index 57de767d..1192b8ca 100644 --- a/dlls/monsters.cpp +++ b/dlls/monsters.cpp @@ -2022,6 +2022,10 @@ void CBaseMonster::MonsterInit( void ) SetThink( &CBaseMonster::MonsterInitThink ); pev->nextthink = gpGlobals->time + 0.1f; SetUse( &CBaseMonster::MonsterUse ); + +#ifdef MONSTER_YAWSPEED_FIX + m_flLastYawTime = gpGlobals->time; +#endif } //========================================================= @@ -2504,7 +2508,15 @@ float CBaseMonster::ChangeYaw( int yawSpeed ) ideal = pev->ideal_yaw; if( current != ideal ) { +#ifdef MONSTER_YAWSPEED_FIX + float delta = gpGlobals->time - m_flLastYawTime; + if( delta > 0.25 ) + delta = 0.25; + + speed = (float)yawSpeed * delta * 2; +#else speed = (float)yawSpeed * gpGlobals->frametime * 10; +#endif move = ideal - current; if( ideal > current ) @@ -2548,6 +2560,10 @@ float CBaseMonster::ChangeYaw( int yawSpeed ) else move = 0; +#ifdef MONSTER_YAWSPEED_FIX + m_flLastYawTime = gpGlobals->time; +#endif + return move; } diff --git a/wscript b/wscript index b08bd906..9c0aba5f 100644 --- a/wscript +++ b/wscript @@ -275,6 +275,7 @@ def configure(conf): conf.define('CROWBAR_DELAY_FIX', False) conf.define('CROWBAR_FIX_RAPID_CROWBAR', False) conf.define('GAUSS_OVERCHARGE_FIX', False) + conf.define('MONSTER_YAWSPEED_FIX', False) if conf.env.DEST_OS == 'android' or conf.options.ENABLE_MOD_HACKS: conf.define('MOBILE_HACKS', '1') From 47c13ef87305d53600af75aa3c7d4d4ffe192641 Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin Date: Sat, 10 Oct 2020 22:43:04 +0500 Subject: [PATCH 5/7] server: Use separate cvar instead of macro for monster yaw speed fix. --- dlls/basemonster.h | 2 -- dlls/game.cpp | 2 ++ dlls/game.h | 1 + dlls/monsters.cpp | 22 ++++++++++------------ wscript | 1 - 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/basemonster.h b/dlls/basemonster.h index 48ac9fc9..a5f7f459 100644 --- a/dlls/basemonster.h +++ b/dlls/basemonster.h @@ -329,8 +329,6 @@ public: CBaseEntity* DropItem( const char *pszItemName, const Vector &vecPos, const Vector &vecAng );// drop an item. -#ifdef MONSTER_YAWSPEED_FIX float m_flLastYawTime; -#endif }; #endif // BASEMONSTER_H diff --git a/dlls/game.cpp b/dlls/game.cpp index c48b44b3..99a959f0 100644 --- a/dlls/game.cpp +++ b/dlls/game.cpp @@ -35,6 +35,7 @@ cvar_t weaponstay = { "mp_weaponstay","0", FCVAR_SERVER }; cvar_t selfgauss = { "mp_selfgauss", "1", FCVAR_SERVER }; cvar_t chargerfix = { "mp_chargerfix", "0", FCVAR_SERVER }; cvar_t satchelfix = { "mp_satchelfix", "0", FCVAR_SERVER }; +cvar_t monsteryawspeedfix = { "monsteryawspeedfix", "0", FCVAR_SERVER }; cvar_t forcerespawn = { "mp_forcerespawn","1", FCVAR_SERVER }; cvar_t flashlight = { "mp_flashlight","0", FCVAR_SERVER }; cvar_t aimcrosshair = { "mp_autocrosshair","1", FCVAR_SERVER }; @@ -482,6 +483,7 @@ void GameDLLInit( void ) CVAR_REGISTER( &selfgauss ); CVAR_REGISTER( &chargerfix ); CVAR_REGISTER( &satchelfix ); + CVAR_REGISTER( &monsteryawspeedfix ); CVAR_REGISTER( &forcerespawn ); CVAR_REGISTER( &flashlight ); CVAR_REGISTER( &aimcrosshair ); diff --git a/dlls/game.h b/dlls/game.h index 026070ff..e60cb4da 100644 --- a/dlls/game.h +++ b/dlls/game.h @@ -30,6 +30,7 @@ extern cvar_t weaponstay; extern cvar_t selfgauss; extern cvar_t chargerfix; extern cvar_t satchelfix; +extern cvar_t monsteryawspeedfix; extern cvar_t forcerespawn; extern cvar_t flashlight; extern cvar_t aimcrosshair; diff --git a/dlls/monsters.cpp b/dlls/monsters.cpp index 1192b8ca..ab82cca5 100644 --- a/dlls/monsters.cpp +++ b/dlls/monsters.cpp @@ -2023,9 +2023,7 @@ void CBaseMonster::MonsterInit( void ) pev->nextthink = gpGlobals->time + 0.1f; SetUse( &CBaseMonster::MonsterUse ); -#ifdef MONSTER_YAWSPEED_FIX m_flLastYawTime = gpGlobals->time; -#endif } //========================================================= @@ -2508,15 +2506,17 @@ float CBaseMonster::ChangeYaw( int yawSpeed ) ideal = pev->ideal_yaw; if( current != ideal ) { -#ifdef MONSTER_YAWSPEED_FIX - float delta = gpGlobals->time - m_flLastYawTime; - if( delta > 0.25 ) - delta = 0.25; + if( monsteryawspeedfix.value ) + { + float delta; + + delta = Q_min( gpGlobals->time - m_flLastYawTime, 0.25f ); + + speed = (float)yawSpeed * delta * 2; + } + else + speed = (float)yawSpeed * gpGlobals->frametime * 10; - speed = (float)yawSpeed * delta * 2; -#else - speed = (float)yawSpeed * gpGlobals->frametime * 10; -#endif move = ideal - current; if( ideal > current ) @@ -2560,9 +2560,7 @@ float CBaseMonster::ChangeYaw( int yawSpeed ) else move = 0; -#ifdef MONSTER_YAWSPEED_FIX m_flLastYawTime = gpGlobals->time; -#endif return move; } diff --git a/wscript b/wscript index 9c0aba5f..b08bd906 100644 --- a/wscript +++ b/wscript @@ -275,7 +275,6 @@ def configure(conf): conf.define('CROWBAR_DELAY_FIX', False) conf.define('CROWBAR_FIX_RAPID_CROWBAR', False) conf.define('GAUSS_OVERCHARGE_FIX', False) - conf.define('MONSTER_YAWSPEED_FIX', False) if conf.env.DEST_OS == 'android' or conf.options.ENABLE_MOD_HACKS: conf.define('MOBILE_HACKS', '1') From 2de25090948b64d2ebbe9d2ae7d5a1b90f60b182 Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin Date: Sat, 10 Oct 2020 22:45:28 +0500 Subject: [PATCH 6/7] server: remove "mp_" prefix for non-multiplayer cvars. --- dlls/game.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/game.cpp b/dlls/game.cpp index 99a959f0..72d0b75f 100644 --- a/dlls/game.cpp +++ b/dlls/game.cpp @@ -32,9 +32,9 @@ cvar_t timelimit = { "mp_timelimit","0", FCVAR_SERVER }; cvar_t friendlyfire = { "mp_friendlyfire","0", FCVAR_SERVER }; cvar_t falldamage = { "mp_falldamage","0", FCVAR_SERVER }; cvar_t weaponstay = { "mp_weaponstay","0", FCVAR_SERVER }; -cvar_t selfgauss = { "mp_selfgauss", "1", FCVAR_SERVER }; -cvar_t chargerfix = { "mp_chargerfix", "0", FCVAR_SERVER }; -cvar_t satchelfix = { "mp_satchelfix", "0", FCVAR_SERVER }; +cvar_t selfgauss = { "selfgauss", "1", FCVAR_SERVER }; +cvar_t chargerfix = { "chargerfix", "0", FCVAR_SERVER }; +cvar_t satchelfix = { "satchelfix", "0", FCVAR_SERVER }; cvar_t monsteryawspeedfix = { "monsteryawspeedfix", "0", FCVAR_SERVER }; cvar_t forcerespawn = { "mp_forcerespawn","1", FCVAR_SERVER }; cvar_t flashlight = { "mp_flashlight","0", FCVAR_SERVER }; From 2a264d2c9a33ebbe122364b4faaf2bbac31e5fab Mon Sep 17 00:00:00 2001 From: Andrey Akhmichin Date: Sun, 11 Oct 2020 00:08:47 +0500 Subject: [PATCH 7/7] Add the latest steam changes for cl_autowepswitch cvar. --- dlls/multiplay_gamerules.cpp | 12 ++++++++++++ dlls/player.cpp | 2 -- dlls/singleplay_gamerules.cpp | 6 ++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/multiplay_gamerules.cpp b/dlls/multiplay_gamerules.cpp index 90dc4f3b..5a4b14e0 100644 --- a/dlls/multiplay_gamerules.cpp +++ b/dlls/multiplay_gamerules.cpp @@ -324,6 +324,12 @@ BOOL CHalfLifeMultiplay::FShouldSwitchWeapon( CBasePlayer *pPlayer, CBasePlayerI return FALSE; } + if( pPlayer->m_iAutoWepSwitch == 2 + && pPlayer->m_afButtonLast & ( IN_ATTACK | IN_ATTACK2 ) ) + { + return FALSE; + } + if( !pPlayer->m_pActiveItem->CanHolster() ) { // can't put away the active item. @@ -573,7 +579,11 @@ void CHalfLifeMultiplay::PlayerSpawn( CBasePlayer *pPlayer ) { BOOL addDefault; CBaseEntity *pWeaponEntity = NULL; + int iOldAutoWepSwitch; + + iOldAutoWepSwitch = pPlayer->m_iAutoWepSwitch; + pPlayer->m_iAutoWepSwitch = 1; pPlayer->pev->weapons |= ( 1 << WEAPON_SUIT ); addDefault = TRUE; @@ -590,6 +600,8 @@ void CHalfLifeMultiplay::PlayerSpawn( CBasePlayer *pPlayer ) pPlayer->GiveNamedItem( "weapon_9mmhandgun" ); pPlayer->GiveAmmo( 68, "9mm", _9MM_MAX_CARRY );// 4 full reloads } + + pPlayer->m_iAutoWepSwitch = iOldAutoWepSwitch; } //========================================================= diff --git a/dlls/player.cpp b/dlls/player.cpp index 6b741778..fc264cc9 100644 --- a/dlls/player.cpp +++ b/dlls/player.cpp @@ -2876,8 +2876,6 @@ void CBasePlayer::Spawn( void ) m_flNextChatTime = gpGlobals->time; - m_iAutoWepSwitch = 1; - g_pGameRules->PlayerSpawn( this ); } diff --git a/dlls/singleplay_gamerules.cpp b/dlls/singleplay_gamerules.cpp index 7f722e30..ba73747b 100644 --- a/dlls/singleplay_gamerules.cpp +++ b/dlls/singleplay_gamerules.cpp @@ -80,6 +80,12 @@ BOOL CHalfLifeRules::FShouldSwitchWeapon( CBasePlayer *pPlayer, CBasePlayerItem return FALSE; } + if( pPlayer->m_iAutoWepSwitch == 2 + && pPlayer->m_afButtonLast & ( IN_ATTACK | IN_ATTACK2 ) ) + { + return FALSE; + } + if( !pPlayer->m_pActiveItem->CanHolster() ) { return FALSE;