R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Common: only rerun 'language->SetValue()' when provided language is unsuppported

Browse Source 
The function was always ran, but it should only be run if the language provided isn't supported.
This commit is contained in:
Kawe Mazidjatari 2024-12-05 13:25:49 +01:00
parent e0c7a9b980
commit 7fd33da180
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/callback.cpp
View File

@ -231,28 +231,24 @@ void VPK_Unmount_f(const CCommand& args)
void LanguageChanged_f(IConVar* pConVar, const char* pOldString, float flOldValue, ChangeUserData_t pUserData)
{
if (ConVar* pConVarRef = g_pCVar->FindVar(pConVar->GetName()))
const char* pNewString = language_cvar->GetString();
if (strcmp(pOldString, pNewString) == NULL)
return; // Same language.
if (!Localize_IsLanguageSupported(pNewString))
{
const char* pNewString = pConVarRef->GetString();
if (strcmp(pOldString, pConVarRef->GetString()) == NULL)
return; // Same language.
if (!Localize_IsLanguageSupported(pNewString))
// if new text isn't valid but the old value is, reset the value
if (Localize_IsLanguageSupported(pOldString))
pNewString = pOldString;
else
{
// if new text isn't valid but the old value is, reset the value
if (Localize_IsLanguageSupported(pOldString))
pNewString = pOldString;
else
{
// this shouldn't really happen, but if neither the old nor new values are valid, set to english
Assert(0);
pNewString = g_LanguageNames[0];
}
// this shouldn't really happen, but if neither the old nor new values are valid, set to english
Assert(0);
pNewString = g_LanguageNames[0];
}
pConVarRef->SetValue(pNewString);
g_MasterServer.SetLanguage(pNewString);
language_cvar->SetValue(pNewString);
}
}