1.1 --- a/core/concmd_cleaner.cpp	Sat Mar 16 18:05:22 2013 -0400
     1.2 +++ b/core/concmd_cleaner.cpp	Sat Mar 16 22:15:25 2013 -0400
     1.3 @@ -64,20 +64,20 @@
     1.4  	void OnSourceModAllInitialized()
     1.5  	{
     1.6  #if SOURCE_ENGINE >= SE_ORANGEBOX
     1.7 -		SH_ADD_HOOK_MEMFUNC(ICvar, UnregisterConCommand, icvar, this, &ConCommandCleaner::UnlinkConCommandBase, false);
     1.8 -		SH_ADD_HOOK_MEMFUNC(ICvar, RegisterConCommand, icvar, this, &ConCommandCleaner::LinkConCommandBase, false);
     1.9 +		SH_ADD_HOOK(ICvar, UnregisterConCommand, icvar, SH_MEMBER(this, &ConCommandCleaner::UnlinkConCommandBase), false);
    1.10 +		SH_ADD_HOOK(ICvar, RegisterConCommand, icvar, SH_MEMBER(this, &ConCommandCleaner::LinkConCommandBase), false);
    1.11  #else
    1.12 -		SH_ADD_HOOK_MEMFUNC(ICvar, RegisterConCommandBase, icvar, this, &ConCommandCleaner::LinkConCommandBase, false);
    1.13 +		SH_ADD_HOOK(ICvar, RegisterConCommandBase, icvar, SH_MEMBER(this, &ConCommandCleaner::LinkConCommandBase), false);
    1.14  #endif
    1.15  	}
    1.16  
    1.17  	void OnSourceModShutdown()
    1.18  	{
    1.19  #if SOURCE_ENGINE >= SE_ORANGEBOX
    1.20 -		SH_REMOVE_HOOK_MEMFUNC(ICvar, UnregisterConCommand, icvar, this, &ConCommandCleaner::UnlinkConCommandBase, false);
    1.21 -		SH_REMOVE_HOOK_MEMFUNC(ICvar, RegisterConCommand, icvar, this, &ConCommandCleaner::LinkConCommandBase, false);
    1.22 +		SH_REMOVE_HOOK(ICvar, UnregisterConCommand, icvar, SH_MEMBER(this, &ConCommandCleaner::UnlinkConCommandBase), false);
    1.23 +		SH_REMOVE_HOOK(ICvar, RegisterConCommand, icvar, SH_MEMBER(this, &ConCommandCleaner::LinkConCommandBase), false);
    1.24  #else
    1.25 -		SH_REMOVE_HOOK_MEMFUNC(ICvar, RegisterConCommandBase, icvar, this, &ConCommandCleaner::LinkConCommandBase, false);
    1.26 +		SH_REMOVE_HOOK(ICvar, RegisterConCommandBase, icvar, SH_MEMBER(this, &ConCommandCleaner::LinkConCommandBase), false);
    1.27  #endif
    1.28  	}
    1.29