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

Make sure language is never NULL

Browse Source 
* Initialize CPylon::m_Language to "english".
* Make sure cvar change callback is always setting values instead of returning out early.
This commit is contained in:
Kawe Mazidjatari 2023-09-16 00:45:11 +02:00
parent 0634261c18
commit 1d41b23abb
4 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
r5dev/common/callback.cpp
View File

@ -30,6 +30,7 @@
#include "filesystem/filesystem.h"
#include "vpklib/packedstore.h"
#include "vscript/vscript.h"
#include "localize/localize.h"
#include "ebisusdk/EbisuSDK.h"
#ifndef DEDICATED
#include "geforce/reflex.h"
@ -1023,37 +1024,23 @@ void GFX_NVN_Changed_f(IConVar* pConVar, const char* pOldString, float flOldValu
}
#endif // !DEDICATED
static bool IsValidTextLanguage(const char* pLocaleName)
{
for (int i = 0; i < SDK_ARRAYSIZE(g_LanguageNames); ++i)
{
if (strcmp(pLocaleName, g_LanguageNames[i]) == NULL)
return true;
}
return false;
}
void LanguageChanged_f(IConVar* pConVar, const char* pOldString, float flOldValue)
{
if (ConVar* pConVarRef = g_pCVar->FindVar(pConVar->GetCommandName()))
{
const char* pNewString = pConVarRef->GetString();
if (IsValidTextLanguage(pNewString))
return;
// if new text isn't valid but the old value is, reset the value
if (IsValidTextLanguage(pOldString))
if (!Localize_IsLanguageSupported(pNewString))
{
pConVarRef->SetValue(pOldString);
return;
// 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
pNewString = g_LanguageNames[0];
}
else // this shouldn't really happen, but if neither the old nor new values are valid, set to english
pConVarRef->SetValue("english");
g_pMasterServer->SetLanguage(pConVarRef->GetString());
pConVarRef->SetValue(pNewString);
g_pMasterServer->SetLanguage(pNewString);
}
}

11
r5dev/localize/localize.cpp
View File

@ -30,6 +30,17 @@ bool Localize_LoadLocalizationFileLists(CLocalize* thisptr)
return true;
}
bool Localize_IsLanguageSupported(const char* pLocaleName)
{
for (int i = 0; i < SDK_ARRAYSIZE(g_LanguageNames); ++i)
{
if (strcmp(pLocaleName, g_LanguageNames[i]) == NULL)
return true;
}
return false;
}
void VLocalize::Attach() const
{
DetourAttach((LPVOID*)&v_CLocalize__LoadLocalizationFileLists, &Localize_LoadLocalizationFileLists);

3
r5dev/localize/localize.h
View File

@ -1,4 +1,7 @@
#pragma once
#include "localize/ilocalize.h"
bool Localize_IsLanguageSupported(const char* pLocaleName);
class CLocalize
{

3
r5dev/networksystem/pylon.h
View File

@ -2,10 +2,13 @@
#include "thirdparty/curl/include/curl/curl.h"
#include "bansystem.h"
#include "serverlisting.h"
#include "localize/ilocalize.h"
class CPylon
{
public:
CPylon() { m_Language = g_LanguageNames[0]; }
vector<NetGameServer_t> GetServerList(string& outMessage) const;
bool GetServerByToken(NetGameServer_t& slOutServer, string& outMessage, const string& svToken) const;
bool PostServerHost(string& outMessage, string& svOutToken, const NetGameServer_t& netGameServer) const;