Server: Player: Call SetPrefsFromUserinfo directly

tmp64 · Aug 24, 2024 · 2584c91 · 2584c91
1 parent 23aeb7b
commit 2584c91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git 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
@@ -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)