From 267312d55342ba9743a4000910433a220db188cd Mon Sep 17 00:00:00 2001
From: Borja Ferrer <faluco@alliedmods.net>
Date: Sun, 19 Aug 2007 15:02:20 +0000
Subject: [PATCH] removed the query code for cl_language

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401361
---
 core/ConVarManager.cpp |  9 ---------
 core/PlayerManager.cpp | 35 +++++------------------------------
 core/PlayerManager.h   |  2 --
 3 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/core/ConVarManager.cpp b/core/ConVarManager.cpp
index 1cd4d42e..e906579a 100644
--- a/core/ConVarManager.cpp
+++ b/core/ConVarManager.cpp
@@ -37,7 +37,6 @@
 #include "sm_srvcmds.h"
 #include "sm_stringutil.h"
 #include <sh_vector.h>
-#include "PlayerManager.h"
 
 ConVarManager g_ConVarManager;
 
@@ -569,14 +568,6 @@ void ConVarManager::OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *
 		{
 			pCallback = query.pCallback;
 			value = query.value;
-
-			if (!pCallback)
-			{
-				g_Players.HandleLangQuery(engine->GetPlayerUserId(pPlayer), (result == eQueryCvarValueStatus_ValueIntact) ? cvarValue : "", cookie);
-				m_ConVarQueries.erase(iter);
-				return;
-			}
-
 			break;
 		}
 	}
diff --git a/core/PlayerManager.cpp b/core/PlayerManager.cpp
index 4621c1c6..4fd7b90f 100644
--- a/core/PlayerManager.cpp
+++ b/core/PlayerManager.cpp
@@ -42,9 +42,7 @@
 #include <iclient.h>
 #include "TimerSys.h"
 #include "Translator.h"
-#include "ConVarManager.h"
 #include "Logger.h"
-#include "HalfLife2.h"
 
 PlayerManager g_Players;
 bool g_OnMapStarted = false;
@@ -500,14 +498,15 @@ void PlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername
 		pPlayer->m_Info = playerinfo->GetPlayerInfo(pEntity);
 	}
 
-	/* Query the client's language */
+	/* Get the client's language */
 	if (m_QueryLang)
 	{
-		if (!pPlayer->IsFakeClient() && !g_IsOriginalEngine)
+		const char *name;
+		if (!pPlayer->IsFakeClient() && (name=engine->GetClientConVarValue(client, "cl_language")))
 		{
-			pPlayer->m_LangCookie = g_ConVarManager.QueryClientConVar(pPlayer->GetEdict(), "cl_language", NULL, 0);
+			unsigned int langid;
+			pPlayer->m_LangId = (g_Translator.GetLanguageByName(name, &langid)) ? langid : g_Translator.GetServerLanguage();
 		} else {
-			/* Skip the query if this is a bot or if we cant query cvars*/
 			pPlayer->m_LangId = g_Translator.GetServerLanguage();
 		}
 	}
@@ -846,28 +845,6 @@ void PlayerManager::RecheckAnyAdmins()
 	}
 }
 
-void PlayerManager::HandleLangQuery(int userid, const char *value, QueryCvarCookie_t cookie)
-{
-	int id = GetClientOfUserId(userid);
-	if (id == 0)
-	{
-		return;
-	}
-
-	CPlayer *pl = GetPlayerByIndex(id);
-
-	unsigned int langid;
-	if (pl->m_LangCookie == cookie)
-	{
-		if (value[0] != '\0' && g_Translator.GetLanguageByName(value, &langid))
-		{
-			pl->m_LangId = langid;
-		} else {
-			pl->m_LangId = g_Translator.GetServerLanguage();
-		}
-	}
-}
-
 /*******************
  *** PLAYER CODE ***
  *******************/
@@ -884,7 +861,6 @@ CPlayer::CPlayer()
 	m_bAdminCheckSignalled = false;
 	m_LastPassword.clear();
 	m_LangId = LANGUAGE_ENGLISH;
-	m_LangCookie = 0;
 }
 
 void CPlayer::Initialize(const char *name, const char *ip, edict_t *pEntity)
@@ -895,7 +871,6 @@ void CPlayer::Initialize(const char *name, const char *ip, edict_t *pEntity)
 	m_pEdict = pEntity;
 	m_iIndex = engine->IndexOfEdict(pEntity);
 	m_LangId = g_Translator.GetServerLanguage();
-	m_LangCookie = 0;
 
 	char ip2[24], *ptr;
 	strncopy(ip2, ip, sizeof(ip2));
diff --git a/core/PlayerManager.h b/core/PlayerManager.h
index bc45ccfc..670dc491 100644
--- a/core/PlayerManager.h
+++ b/core/PlayerManager.h
@@ -92,7 +92,6 @@ private:
 	bool m_bAdminCheckSignalled;
 	int m_iIndex;
 	unsigned int m_LangId;
-	QueryCvarCookie_t m_LangCookie;
 	int m_UserId;
 };
 
@@ -130,7 +129,6 @@ public: //IPlayerManager
 	int GetMaxClients();
 	int GetNumPlayers();
 	int GetClientOfUserId(int userid);
-	void HandleLangQuery(int userid, const char *value, QueryCvarCookie_t cookie);
 public:
 	inline int MaxClients()
 	{