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

Fix command callbacks

Browse Source
This commit is contained in:
AnAkkk
2014-08-28 19:42:10 +02:00
parent 399db8d47e
commit a0bb9c48cf
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/tier1/convar.h
View File

@ -345,8 +345,8 @@ private:
}; };
bool m_bHasCompletionCallback : 1; bool m_bHasCompletionCallback : 1;
bool m_bUsingNewCommandCallback : 1;
bool m_bUsingCommandCallbackInterface : 1; bool m_bUsingCommandCallbackInterface : 1;
bool m_bUsingOldCommandCallback : 1;
bool m_bUsingCommandCallbackInterface2 : 1; bool m_bUsingCommandCallbackInterface2 : 1;
}; };

20
tier1/convar.cpp
View File

@ -519,7 +519,7 @@ ConCommand::ConCommand( const char *pName, FnCommandCallbackV1_t callback, const
{ {
// Set the callback // Set the callback
m_fnCommandCallbackV1 = callback; m_fnCommandCallbackV1 = callback;
m_bUsingNewCommandCallback = false; m_bUsingOldCommandCallback = true;
m_bUsingCommandCallbackInterface = false; m_bUsingCommandCallbackInterface = false;
m_bUsingCommandCallbackInterface2 = false; m_bUsingCommandCallbackInterface2 = false;
m_fnCompletionCallback = completionFunc ? completionFunc : DefaultCompletionFunc; m_fnCompletionCallback = completionFunc ? completionFunc : DefaultCompletionFunc;
@ -533,7 +533,7 @@ ConCommand::ConCommand( const char *pName, FnCommandCallback_t callback, const c
{ {
// Set the callback // Set the callback
m_fnCommandCallback = callback; m_fnCommandCallback = callback;
m_bUsingNewCommandCallback = true; m_bUsingOldCommandCallback = false;
m_fnCompletionCallback = completionFunc ? completionFunc : DefaultCompletionFunc; m_fnCompletionCallback = completionFunc ? completionFunc : DefaultCompletionFunc;
m_bHasCompletionCallback = completionFunc != 0 ? true : false; m_bHasCompletionCallback = completionFunc != 0 ? true : false;
m_bUsingCommandCallbackInterface = false; m_bUsingCommandCallbackInterface = false;
@ -547,7 +547,7 @@ ConCommand::ConCommand( const char *pName, ICommandCallback *pCallback, const ch
{ {
// Set the callback // Set the callback
m_pCommandCallback = pCallback; m_pCommandCallback = pCallback;
m_bUsingNewCommandCallback = false; m_bUsingOldCommandCallback = false;
m_pCommandCompletionCallback = pCompletionCallback; m_pCommandCompletionCallback = pCompletionCallback;
m_bHasCompletionCallback = ( pCompletionCallback != 0 ); m_bHasCompletionCallback = ( pCompletionCallback != 0 );
m_bUsingCommandCallbackInterface = true; m_bUsingCommandCallbackInterface = true;
@ -561,7 +561,7 @@ ConCommand::ConCommand( const char *pName, ICommandCallback2 *pCallback, const c
{ {
// Set the callback // Set the callback
m_pCommandCallback2 = pCallback; m_pCommandCallback2 = pCallback;
m_bUsingNewCommandCallback = false; m_bUsingOldCommandCallback = false;
m_pCommandCompletionCallback = pCompletionCallback; m_pCommandCompletionCallback = pCompletionCallback;
m_bHasCompletionCallback = ( pCompletionCallback != 0 ); m_bHasCompletionCallback = ( pCompletionCallback != 0 );
m_bUsingCommandCallbackInterface = false; m_bUsingCommandCallbackInterface = false;
@ -593,11 +593,11 @@ bool ConCommand::IsCommand( void ) const
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void ConCommand::Dispatch( const CCommandContext &context, const CCommand &command ) void ConCommand::Dispatch( const CCommandContext &context, const CCommand &command )
{ {
if ( m_bUsingNewCommandCallback ) if ( m_bUsingOldCommandCallback )
{ {
if ( m_fnCommandCallback ) if ( m_fnCommandCallbackV1 )
{ {
( *m_fnCommandCallback )( context, command ); ( *m_fnCommandCallbackV1 )();
return; return;
} }
} }
@ -619,11 +619,11 @@ void ConCommand::Dispatch( const CCommandContext &context, const CCommand &comma
} }
else else
{ {
if ( m_fnCommandCallbackV1 ) if ( m_fnCommandCallback )
{ {
( *m_fnCommandCallbackV1 )(); ( *m_fnCommandCallback )( context, command );
return; return;
} }
} }
// Command without callback!!! // Command without callback!!!