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

Fix ConVar crash

Browse Source 
Fix crash caused by vftable error. Since we are not implementing anything, but only interfacing with the game executable, we need to rename the IConVar variant's due to name ambiguity. Re-defining them in the actual class will lead into vftable misalignment and cause a crash (or other undesired behavior) as a result.
This commit is contained in:
Kawe Mazidjatari 2023-03-28 01:24:55 +02:00
parent 2607f024b9
commit 5a0be4a275
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
r5dev/public/iconvar.h
View File

@ -136,15 +136,17 @@ public:
virtual void SetValue(float flValue) = 0;
virtual void SetValue(int nValue) = 0;
// Return name of command
virtual const char* GetName(void) const = 0;
// Original name 'GetName'. Renamed due to name ambiguity
// as we are not implementing it in ConVar, we are just
// interfacing it with the game executable.
virtual const char* GetCommandName(void) const = 0;
// Return name of command (usually == GetName(), except in case of FCVAR_SS_ADDED vars
virtual const char* GetBaseName(void) const = 0;
// Accessors.. not as efficient as using GetState()/GetInfo()
// if you call these methods multiple times on the same IConVar
virtual bool IsFlagSet(int nFlag) const = 0;
virtual bool IsConVarFlagSet(int nFlag) const = 0; // Original name 'IsFlagSet'. Renamed for same reason as 'GetName'.
virtual int GetSplitScreenPlayerSlot() const = 0;
};

3
r5dev/tier1/cvar.h
View File

@ -402,9 +402,6 @@ public:
void InstallChangeCallback(FnChangeCallback_t callback, bool bInvoke);
void RemoveChangeCallback(FnChangeCallback_t callback);
virtual bool IsFlagSet(int nFlags) { return (nFlags & m_pParent->m_nFlags) ? true : false; };
virtual const char* GetName(void) const { return m_pParent->m_pszName; };
struct CVValue_t
{
char* m_pszString;

4
r5dev/vstdlib/callback.cpp
View File

@ -727,7 +727,7 @@ NET_UseRandomKeyChanged_f
*/
void NET_UseRandomKeyChanged_f(IConVar* pConVar, const char* pOldString, float flOldValue)
{
if (ConVar* pConVarRef = g_pCVar->FindVar(pConVar->GetName()))
if (ConVar* pConVarRef = g_pCVar->FindVar(pConVar->GetCommandName()))
{
if (strcmp(pOldString, pConVarRef->GetString()) == NULL)
return; // Same value.
@ -931,7 +931,7 @@ RCON_PasswordChanged_f
*/
void RCON_PasswordChanged_f(IConVar* pConVar, const char* pOldString, float flOldValue)
{
if (ConVar* pConVarRef = g_pCVar->FindVar(pConVar->GetName()))
if (ConVar* pConVarRef = g_pCVar->FindVar(pConVar->GetCommandName()))
{
if (strcmp(pOldString, pConVarRef->GetString()) == NULL)
return; // Same password.