Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2024-12-23 01:59:43 +08:00
Code

Fix command registration

Browse Source 
This prevents static initialization problem that was arising where CUtlVector constructor was called after commands were added to it, resulting in an empty list when it gets to the registration step
This commit is contained in:
GAMMACASE 2023-09-09 22:09:29 +03:00 committed by Nicholas Hastings
parent 603427af94
commit 0048b058e6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tier1/convar.cpp
View File

@ -57,7 +57,7 @@ public:
}
else
{
s_ConCommandRegList.AddToTail(pCmd);
GetCommandRegList()->AddToTail(pCmd);
}
}
@ -67,9 +67,9 @@ public:
{
s_bConCommandsRegistered = true;
FOR_EACH_VEC( s_ConCommandRegList, i)
for(int i = 0; i < GetCommandRegList()->Count(); i++)
{
ConCommand *pCmd = s_ConCommandRegList[i];
ConCommand *pCmd = GetCommandRegList()->Element(i);
ConCommandHandle hndl = g_pCVar->RegisterConCommand(pCmd, s_nCVarFlag);
pCmd->SetHandle(hndl);
@ -82,13 +82,18 @@ public:
}
}
private:
static CUtlVector<ConCommand*> s_ConCommandRegList;
// GAMMACASE: Required to prevent static initialization order problem https://isocpp.org/wiki/faq/ctors#static-init-order
static CUtlVector<ConCommand *> *GetCommandRegList()
{
static CUtlVector<ConCommand *> s_ConCommandRegList;
return &s_ConCommandRegList;
}
static bool s_bConCommandsRegistered;
};
bool ConCommandRegList::s_bConCommandsRegistered = false;
CUtlVector<ConCommand*> ConCommandRegList::s_ConCommandRegList;
#ifdef CONVAR_WORK_FINISHED
template <typename ToCheck, std::size_t ExpectedSize, std::size_t RealSize = sizeof(ToCheck)>