From 2584c91aaeb58d9ca6d91f0f7d6b33251e80114b Mon Sep 17 00:00:00 2001 From: tmp64 Date: Sat, 24 Aug 2024 13:17:05 +0700 Subject: [PATCH] Server: Player: Call SetPrefsFromUserinfo directly --- src/game/server/client.cpp | 4 +--- src/game/server/multiplay_gamerules.cpp | 10 +++------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/game/server/client.cpp b/src/game/server/client.cpp index 1cea1d5b..5b7c166e 100644 --- a/src/game/server/client.cpp +++ b/src/game/server/client.cpp @@ -724,9 +724,7 @@ void ClientUserInfoChanged(edict_t *pEntity, char *infobuffer) } } - // Get weapon switching vars - char *autowepswitch = g_engfuncs.pfnInfoKeyValue(infobuffer, "cl_autowepswitch"); - pPlayer->m_iAutoWepSwitch = autowepswitch[0] == 0 ? 1 : atoi(autowepswitch); + pPlayer->SetPrefsFromUserinfo(infobuffer); g_pGameRules->ClientUserInfoChanged(pPlayer, infobuffer); } diff --git a/src/game/server/multiplay_gamerules.cpp b/src/game/server/multiplay_gamerules.cpp index 36a226bb..599aa6a8 100644 --- a/src/game/server/multiplay_gamerules.cpp +++ b/src/game/server/multiplay_gamerules.cpp @@ -340,8 +340,7 @@ BOOL CHalfLifeMultiplay::FShouldSwitchWeapon(CBasePlayer *pPlayer, CBasePlayerIt // player disabled auto weapon switching return FALSE; } - - if (pPlayer->m_iAutoWepSwitch == 2) + else if (pPlayer->m_iAutoWepSwitch == 2) { // player disabled auto weapon switching when firing if (pPlayer->m_afButtonLast & (IN_ATTACK | IN_ATTACK2)) @@ -1870,8 +1869,6 @@ void CHalfLifeMultiplay::SendHtmlMOTDToClient(edict_t *client, char *string) void CHalfLifeMultiplay ::ClientUserInfoChanged(CBasePlayer *pPlayer, char *infobuffer) { - // Set preferences - pPlayer->SetPrefsFromUserinfo(infobuffer); } //========================================================= @@ -2132,10 +2129,9 @@ void CMultiplayBusters::PlayerGotWeapon(CBasePlayer *pPlayer, CBasePlayerItem *p void CMultiplayBusters::ClientUserInfoChanged(CBasePlayer *pPlayer, char *infobuffer) { - SetPlayerModel(pPlayer); + CHalfLifeMultiplay::ClientUserInfoChanged(pPlayer, infobuffer); - // Set preferences - pPlayer->SetPrefsFromUserinfo(infobuffer); + SetPlayerModel(pPlayer); } void CMultiplayBusters::PlayerSpawn(CBasePlayer *pPlayer)