Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 20:16:10 +08:00
Code Activity

Update ConVar flags for ConVar_Register to use correct type (alliedmodders/metamod-source#42).

Browse Source
This commit is contained in:
Nicholas Hastings
2018-03-14 18:09:45 -04:00
parent 16ba4f7602
commit 27fe1b091f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/tier1/convar.h
View File

@ -124,7 +124,7 @@ class ConCommandBase
friend class CCvar; friend class CCvar;
friend class ConVar; friend class ConVar;
friend class ConCommand; friend class ConCommand;
friend void ConVar_Register( int nCVarFlag, IConCommandBaseAccessor *pAccessor ); friend void ConVar_Register( int64 nCVarFlag, IConCommandBaseAccessor *pAccessor );
friend void ConVar_PublishToVXConsole(); friend void ConVar_PublishToVXConsole();
// FIXME: Remove when ConVar changes are done // FIXME: Remove when ConVar changes are done
@ -894,7 +894,7 @@ FORCEINLINE_CVAR const char *SplitScreenConVarRef::GetDefault() const
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Called by the framework to register ConCommands with the ICVar // Called by the framework to register ConCommands with the ICVar
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void ConVar_Register( int nCVarFlag = 0, IConCommandBaseAccessor *pAccessor = NULL ); void ConVar_Register( int64 nCVarFlag = 0, IConCommandBaseAccessor *pAccessor = NULL );
void ConVar_Unregister( ); void ConVar_Unregister( );

4
tier1/convar.cpp
View File

@ -37,7 +37,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
ConCommandBase *ConCommandBase::s_pConCommandBases = NULL; ConCommandBase *ConCommandBase::s_pConCommandBases = NULL;
IConCommandBaseAccessor *ConCommandBase::s_pAccessor = NULL; IConCommandBaseAccessor *ConCommandBase::s_pAccessor = NULL;
static int s_nCVarFlag = 0; static int64 s_nCVarFlag = 0;
static int s_nDLLIdentifier = -1; // A unique identifier indicating which DLL this convar came from static int s_nDLLIdentifier = -1; // A unique identifier indicating which DLL this convar came from
static bool s_bRegistered = false; static bool s_bRegistered = false;
@ -57,7 +57,7 @@ static CDefaultAccessor s_DefaultAccessor;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Called by the framework to register ConCommandBases with the ICVar // Called by the framework to register ConCommandBases with the ICVar
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void ConVar_Register( int nCVarFlag, IConCommandBaseAccessor *pAccessor ) void ConVar_Register( int64 nCVarFlag, IConCommandBaseAccessor *pAccessor )
{ {
if ( !g_pCVar || s_bRegistered ) if ( !g_pCVar || s_bRegistered )
return; return;