UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move translator from logic to core (bug 4406 part 6, r=ds).

Browse Source 
--HG--
rename : core/PhraseCollection.cpp => core/logic/PhraseCollection.cpp
rename : core/PhraseCollection.h => core/logic/PhraseCollection.h
rename : core/Translator.cpp => core/logic/Translator.cpp
rename : core/Translator.h => core/logic/Translator.h
rename : core/sm_memtable.h => core/logic/sm_memtable.h
rename : core/smn_lang.cpp => core/logic/smn_lang.cpp
This commit is contained in:
David Anderson
2010-05-14 19:43:53 -07:00
parent 721dae3892
commit 9137e92c09
27 changed files with 353 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/sm_stringutil.cpp
+9 -9
View File
@@ -35,8 +35,8 @@
#include "sm_stringutil.h"
#include "Logger.h"
#include "PluginSys.h"
#include "Translator.h"
#include "PlayerManager.h"
#include "logic_bridge.h"
#define LADJUST 0x00000004 /* left adjustment */
#define ZEROPAD 0x00000080 /* zero (as opposed to blank) pad */
@@ -81,11 +81,11 @@ size_t Translate(char *buffer,
try_serverlang:
if (target == SOURCEMOD_SERVER_LANGUAGE)
{
langid = g_Translator.GetServerLanguage();
langid = translator->GetServerLanguage();
}
else if ((target >= 1) && (target <= g_Players.GetMaxClients()))
{
langid = g_Translator.GetClientLanguage(target);
langid = translator->GetClientLanguage(target);
}
else
{
@@ -95,7 +95,7 @@ try_serverlang:
if (pPhrases->FindTranslation(key, langid, &pTrans) != Trans_Okay)
{
if (target != SOURCEMOD_SERVER_LANGUAGE && langid != g_Translator.GetServerLanguage())
if (target != SOURCEMOD_SERVER_LANGUAGE && langid != translator->GetServerLanguage())
{
target = SOURCEMOD_SERVER_LANGUAGE;
goto try_serverlang;
@@ -785,21 +785,21 @@ reswitch:
}
else
{
target = g_Translator.GetGlobalTarget();
target = translator->GetGlobalTarget();
}
try_again:
if (target == SOURCEMOD_SERVER_LANGUAGE)
{
lang_id = g_Translator.GetServerLanguage();
lang_id = translator->GetServerLanguage();
}
else if (target >= 1 && target <= g_Players.GetMaxClients())
{
lang_id = g_Translator.GetClientLanguage(target);
lang_id = translator->GetClientLanguage(target);
}
else
{
lang_id = g_Translator.GetServerLanguage();
lang_id = translator->GetServerLanguage();
}
if (pPhrases == NULL)
@@ -813,7 +813,7 @@ try_again:
if (pPhrases->FindTranslation(key, lang_id, &trans) != Trans_Okay)
{
if (target != SOURCEMOD_SERVER_LANGUAGE && lang_id != g_Translator.GetServerLanguage())
if (target != SOURCEMOD_SERVER_LANGUAGE && lang_id != translator->GetServerLanguage())
{
target = SOURCEMOD_SERVER_LANGUAGE;
goto try_again;