diff options
| author | Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> | 2022-03-27 10:54:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 10:54:09 +0200 |
| commit | f1a8ce9337ce84f25fc1a78458f43377c7b36f4d (patch) | |
| tree | bb5ea746c277f6b6c720deac8e6dadcd682440f7 /NorthstarDedicatedTest/convar.cpp | |
| parent | b5405b462656b83a37bf1eb41b049b0913980a13 (diff) | |
| parent | 379cbc8bc251307777a14b901e5617e834398485 (diff) | |
| download | NorthstarLauncher-f1a8ce9337ce84f25fc1a78458f43377c7b36f4d.tar.gz NorthstarLauncher-f1a8ce9337ce84f25fc1a78458f43377c7b36f4d.zip | |
Merge branch 'main' into NetCon
Diffstat (limited to 'NorthstarDedicatedTest/convar.cpp')
| -rw-r--r-- | NorthstarDedicatedTest/convar.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/NorthstarDedicatedTest/convar.cpp b/NorthstarDedicatedTest/convar.cpp index 7023e13c..3f2728d0 100644 --- a/NorthstarDedicatedTest/convar.cpp +++ b/NorthstarDedicatedTest/convar.cpp @@ -6,10 +6,6 @@ #include "gameutils.h" #include "sourceinterface.h" -// should this be in modmanager? -std::unordered_map<std::string, ConVar*> - g_CustomConvars; // this is used in modloading code to determine whether we've registered a mod convar already - typedef void (*ConVarRegisterType)( ConVar* pConVar, const char* pszName, const char* pszDefaultValue, int nFlags, const char* pszHelpString, bool bMin, float fMin, bool bMax, float fMax, void* pCallback); @@ -40,6 +36,8 @@ void InitialiseConVars(HMODULE baseAddress) HookEnabler hook; ENABLER_CREATEHOOK(hook, (char*)baseAddress + 0x417FA0, &ConVar::IsFlagSet, reinterpret_cast<LPVOID*>(&CvarIsFlagSet)); + + } //----------------------------------------------------------------------------- @@ -54,8 +52,6 @@ ConVar::ConVar(const char* pszName, const char* pszDefaultValue, int nFlags, con conVarMalloc(&this->m_pMalloc, 0, 0); // Allocate new memory for ConVar. conVarRegister(this, pszName, pszDefaultValue, nFlags, pszHelpString, 0, 0, 0, 0, 0); - - g_CustomConvars.emplace(pszName, this); } //----------------------------------------------------------------------------- @@ -72,8 +68,6 @@ ConVar::ConVar( conVarMalloc(&this->m_pMalloc, 0, 0); // Allocate new memory for ConVar. conVarRegister(this, pszName, pszDefaultValue, nFlags, pszHelpString, bMin, fMin, bMax, fMax, pCallback); - - g_CustomConvars.emplace(pszName, this); } //----------------------------------------------------------------------------- @@ -82,10 +76,7 @@ ConVar::ConVar( ConVar::~ConVar(void) { if (m_Value.m_pszString) - { delete[] m_Value.m_pszString; - m_Value.m_pszString = NULL; - } } //----------------------------------------------------------------------------- |