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 to use int64 everywhere. (alliedmodders/metamod-source#42)

Browse Source 
Still needs tier1 recompile.
This commit is contained in:
Nicholas Hastings
2018-03-13 17:54:16 -04:00
parent 4405fd7523
commit 3940eefc90
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
public/tier1/convar.h
View File

@ -133,7 +133,7 @@ class ConCommandBase
public: public:
ConCommandBase( void ); ConCommandBase( void );
ConCommandBase( const char *pName, const char *pHelpString = 0, ConCommandBase( const char *pName, const char *pHelpString = 0,
int flags = 0 ); int64 flags = 0 );
virtual ~ConCommandBase( void ); virtual ~ConCommandBase( void );
@ -167,7 +167,7 @@ public:
protected: protected:
virtual void Create( const char *pName, const char *pHelpString = 0, virtual void Create( const char *pName, const char *pHelpString = 0,
int flags = 0 ); int64 flags = 0 );
// Used internally by OneTimeInit to initialize/shutdown // Used internally by OneTimeInit to initialize/shutdown
virtual void Init(); virtual void Init();
@ -295,13 +295,13 @@ public:
typedef ConCommandBase BaseClass; typedef ConCommandBase BaseClass;
ConCommand( const char *pName, FnCommandCallback_t callback, ConCommand( const char *pName, FnCommandCallback_t callback,
const char *pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0 ); const char *pHelpString = 0, int64 flags = 0, FnCommandCompletionCallback completionFunc = 0 );
ConCommand(const char *pName, FnCommandCallbackV1_t callback, ConCommand(const char *pName, FnCommandCallbackV1_t callback,
const char *pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0); const char *pHelpString = 0, int64 flags = 0, FnCommandCompletionCallback completionFunc = 0);
ConCommand(const char *pName, FnCommandCallbackV2_t callback, ConCommand(const char *pName, FnCommandCallbackV2_t callback,
const char *pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0); const char *pHelpString = 0, int64 flags = 0, FnCommandCompletionCallback completionFunc = 0);
ConCommand( const char *pName, ICommandCallback *pCallback, ConCommand( const char *pName, ICommandCallback *pCallback,
const char *pHelpString = 0, int flags = 0, ICommandCompletionCallback *pCommandCompletionCallback = 0 ); const char *pHelpString = 0, int64 flags = 0, ICommandCompletionCallback *pCommandCompletionCallback = 0 );
virtual ~ConCommand( void ); virtual ~ConCommand( void );
@ -367,15 +367,15 @@ friend class SplitScreenConVarRef;
public: public:
typedef ConCommandBase BaseClass; typedef ConCommandBase BaseClass;
ConVar( const char *pName, const char *pDefaultValue, int flags = 0); ConVar( const char *pName, const char *pDefaultValue, int64 flags = 0);
ConVar( const char *pName, const char *pDefaultValue, int flags, ConVar( const char *pName, const char *pDefaultValue, int64 flags,
const char *pHelpString ); const char *pHelpString );
ConVar( const char *pName, const char *pDefaultValue, int flags, ConVar( const char *pName, const char *pDefaultValue, int64 flags,
const char *pHelpString, bool bMin, float fMin, bool bMax, float fMax ); const char *pHelpString, bool bMin, float fMin, bool bMax, float fMax );
ConVar( const char *pName, const char *pDefaultValue, int flags, ConVar( const char *pName, const char *pDefaultValue, int64 flags,
const char *pHelpString, FnChangeCallback_t callback ); const char *pHelpString, FnChangeCallback_t callback );
ConVar( const char *pName, const char *pDefaultValue, int flags, ConVar( const char *pName, const char *pDefaultValue, int64 flags,
const char *pHelpString, bool bMin, float fMin, bool bMax, float fMax, const char *pHelpString, bool bMin, float fMin, bool bMax, float fMax,
FnChangeCallback_t callback ); FnChangeCallback_t callback );
@ -470,7 +470,7 @@ private:
virtual bool ClampValue( float& value ); virtual bool ClampValue( float& value );
virtual void ChangeStringValue( const char *tempVal, float flOldValue ); virtual void ChangeStringValue( const char *tempVal, float flOldValue );
virtual void Create( const char *pName, const char *pDefaultValue, int flags = 0, virtual void Create( const char *pName, const char *pDefaultValue, int64 flags = 0,
const char *pHelpString = 0, bool bMin = false, float fMin = 0.0, const char *pHelpString = 0, bool bMin = false, float fMin = 0.0,
bool bMax = false, float fMax = false, FnChangeCallback_t callback = 0 ); bool bMax = false, float fMax = false, FnChangeCallback_t callback = 0 );
@ -920,7 +920,7 @@ class CConCommandMemberAccessor : public ConCommand, public ICommandCallback, pu
public: public:
CConCommandMemberAccessor( T* pOwner, const char *pName, FnMemberCommandCallback_t callback, const char *pHelpString = 0, CConCommandMemberAccessor( T* pOwner, const char *pName, FnMemberCommandCallback_t callback, const char *pHelpString = 0,
int flags = 0, FnMemberCommandCompletionCallback_t completionFunc = 0 ) : int64 flags = 0, FnMemberCommandCompletionCallback_t completionFunc = 0 ) :
BaseClass( pName, this, pHelpString, flags, ( completionFunc != 0 ) ? this : NULL ) BaseClass( pName, this, pHelpString, flags, ( completionFunc != 0 ) ? this : NULL )
{ {
m_pOwner = pOwner; m_pOwner = pOwner;

24
tier1/convar.cpp
View File

@ -113,7 +113,7 @@ ConCommandBase::ConCommandBase( void )
// *pHelpString - help text // *pHelpString - help text
// flags - flags // flags - flags
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
ConCommandBase::ConCommandBase( const char *pName, const char *pHelpString /*=0*/, int flags /*= 0*/ ) ConCommandBase::ConCommandBase( const char *pName, const char *pHelpString /*=0*/, int64 flags /*= 0*/ )
{ {
Create( pName, pHelpString, flags ); Create( pName, pHelpString, flags );
} }
@ -152,7 +152,7 @@ CVarDLLIdentifier_t ConCommandBase::GetDLLIdentifier() const
// *pHelpString - // *pHelpString -
// flags - // flags -
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void ConCommandBase::Create( const char *pName, const char *pHelpString /*= 0*/, int flags /*= 0*/ ) void ConCommandBase::Create( const char *pName, const char *pHelpString /*= 0*/, int64 flags /*= 0*/ )
{ {
static const char *empty_string = ""; static const char *empty_string = "";
@ -512,7 +512,7 @@ int DefaultCompletionFunc( const char *partial, CUtlVector< CUtlString > &comman
} }
ConCommand::ConCommand( const char *pName, FnCommandCallback_t callback, const char *pHelpString /*= 0*/, int flags /*= 0*/, FnCommandCompletionCallback completionFunc /*= 0*/ ) ConCommand::ConCommand( const char *pName, FnCommandCallback_t callback, const char *pHelpString /*= 0*/, int64 flags /*= 0*/, FnCommandCompletionCallback completionFunc /*= 0*/ )
{ {
// Add the callback // Add the callback
if (callback) if (callback)
@ -536,7 +536,7 @@ ConCommand::ConCommand( const char *pName, FnCommandCallback_t callback, const c
BaseClass::Create( pName, pHelpString, flags ); BaseClass::Create( pName, pHelpString, flags );
} }
ConCommand::ConCommand(const char *pName, FnCommandCallbackV1_t callback, const char *pHelpString /*= 0*/, int flags /*= 0*/, FnCommandCompletionCallback completionFunc /*= 0*/) ConCommand::ConCommand(const char *pName, FnCommandCallbackV1_t callback, const char *pHelpString /*= 0*/, int64 flags /*= 0*/, FnCommandCompletionCallback completionFunc /*= 0*/)
{ {
// Add the callback // Add the callback
if (callback) if (callback)
@ -560,7 +560,7 @@ ConCommand::ConCommand(const char *pName, FnCommandCallbackV1_t callback, const
BaseClass::Create(pName, pHelpString, flags); BaseClass::Create(pName, pHelpString, flags);
} }
ConCommand::ConCommand(const char *pName, FnCommandCallbackV2_t callback, const char *pHelpString /*= 0*/, int flags /*= 0*/, FnCommandCompletionCallback completionFunc /*= 0*/) ConCommand::ConCommand(const char *pName, FnCommandCallbackV2_t callback, const char *pHelpString /*= 0*/, int64 flags /*= 0*/, FnCommandCompletionCallback completionFunc /*= 0*/)
{ {
// Add the callback // Add the callback
if (callback) if (callback)
@ -584,7 +584,7 @@ ConCommand::ConCommand(const char *pName, FnCommandCallbackV2_t callback, const
BaseClass::Create(pName, pHelpString, flags); BaseClass::Create(pName, pHelpString, flags);
} }
ConCommand::ConCommand( const char *pName, ICommandCallback *pCallback, const char *pHelpString /*= 0*/, int flags /*= 0*/, ICommandCompletionCallback *pCompletionCallback /*= 0*/ ) ConCommand::ConCommand( const char *pName, ICommandCallback *pCallback, const char *pHelpString /*= 0*/, int64 flags /*= 0*/, ICommandCompletionCallback *pCompletionCallback /*= 0*/ )
{ {
// Add the callback iface // Add the callback iface
if (pCallback) if (pCallback)
@ -701,27 +701,27 @@ bool ConCommand::CanAutoComplete( void )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Various constructors // Various constructors
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
ConVar::ConVar( const char *pName, const char *pDefaultValue, int flags /* = 0 */ ) ConVar::ConVar( const char *pName, const char *pDefaultValue, int64 flags /* = 0 */ )
{ {
Create( pName, pDefaultValue, flags ); Create( pName, pDefaultValue, flags );
} }
ConVar::ConVar( const char *pName, const char *pDefaultValue, int flags, const char *pHelpString ) ConVar::ConVar( const char *pName, const char *pDefaultValue, int64 flags, const char *pHelpString )
{ {
Create( pName, pDefaultValue, flags, pHelpString ); Create( pName, pDefaultValue, flags, pHelpString );
} }
ConVar::ConVar( const char *pName, const char *pDefaultValue, int flags, const char *pHelpString, bool bMin, float fMin, bool bMax, float fMax ) ConVar::ConVar( const char *pName, const char *pDefaultValue, int64 flags, const char *pHelpString, bool bMin, float fMin, bool bMax, float fMax )
{ {
Create( pName, pDefaultValue, flags, pHelpString, bMin, fMin, bMax, fMax ); Create( pName, pDefaultValue, flags, pHelpString, bMin, fMin, bMax, fMax );
} }
ConVar::ConVar( const char *pName, const char *pDefaultValue, int flags, const char *pHelpString, FnChangeCallback_t callback ) ConVar::ConVar( const char *pName, const char *pDefaultValue, int64 flags, const char *pHelpString, FnChangeCallback_t callback )
{ {
Create( pName, pDefaultValue, flags, pHelpString, false, 0.0, false, 0.0, callback ); Create( pName, pDefaultValue, flags, pHelpString, false, 0.0, false, 0.0, callback );
} }
ConVar::ConVar( const char *pName, const char *pDefaultValue, int flags, const char *pHelpString, bool bMin, float fMin, bool bMax, float fMax, FnChangeCallback_t callback ) ConVar::ConVar( const char *pName, const char *pDefaultValue, int64 flags, const char *pHelpString, bool bMin, float fMin, bool bMax, float fMax, FnChangeCallback_t callback )
{ {
Create( pName, pDefaultValue, flags, pHelpString, bMin, fMin, bMax, fMax, callback ); Create( pName, pDefaultValue, flags, pHelpString, bMin, fMin, bMax, fMax, callback );
} }
@ -1010,7 +1010,7 @@ float ConVar::GetFloatVirtualized() const
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: Private creation // Purpose: Private creation
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void ConVar::Create( const char *pName, const char *pDefaultValue, int flags /*= 0*/, void ConVar::Create( const char *pName, const char *pDefaultValue, int64 flags /*= 0*/,
const char *pHelpString /*= NULL*/, bool bMin /*= false*/, float fMin /*= 0.0*/, const char *pHelpString /*= NULL*/, bool bMin /*= false*/, float fMin /*= 0.0*/,
bool bMax /*= false*/, float fMax /*= false*/, FnChangeCallback_t callback /*= NULL*/ ) bool bMax /*= false*/, float fMax /*= false*/, FnChangeCallback_t callback /*= NULL*/ )
{ {