1.1 --- a/core/ConCmdManager.cpp	Sat Mar 16 18:05:22 2013 -0400
     1.2 +++ b/core/ConCmdManager.cpp	Sat Mar 16 22:15:25 2013 -0400
     1.3 @@ -75,13 +75,13 @@
     1.4  {
     1.5  	g_PluginSys.AddPluginsListener(this);
     1.6  	g_RootMenu.AddRootConsoleCommand("cmds", "List console commands", this);
     1.7 -	SH_ADD_HOOK_MEMFUNC(IServerGameClients, SetCommandClient, serverClients, this, &ConCmdManager::SetCommandClient, false);
     1.8 +	SH_ADD_HOOK(IServerGameClients, SetCommandClient, serverClients, SH_MEMBER(this, &ConCmdManager::SetCommandClient), false);
     1.9  }
    1.10  
    1.11  void ConCmdManager::OnSourceModShutdown()
    1.12  {
    1.13  	/* All commands should already be removed by the time we're done */
    1.14 -	SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, SetCommandClient, serverClients, this, &ConCmdManager::SetCommandClient, false);
    1.15 +	SH_REMOVE_HOOK(IServerGameClients, SetCommandClient, serverClients, SH_MEMBER(this, &ConCmdManager::SetCommandClient), false);
    1.16  	g_RootMenu.RemoveRootConsoleCommand("cmds", this);
    1.17  }
    1.18  
    1.19 @@ -826,7 +826,7 @@
    1.20  			if (is_read_safe)
    1.21  			{
    1.22  				/* Remove the external hook */
    1.23 -				SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, info->pCmd, CommandCallback, false);
    1.24 +				SH_REMOVE_HOOK(ConCommand, Dispatch, info->pCmd, SH_STATIC(CommandCallback), false);
    1.25  			}
    1.26  			if (untrack)
    1.27  			{
    1.28 @@ -897,7 +897,7 @@
    1.29  		else
    1.30  		{
    1.31  			TrackConCommandBase(pCmd, this);
    1.32 -			SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, pCmd, CommandCallback, false);
    1.33 +			SH_ADD_HOOK(ConCommand, Dispatch, pCmd, SH_STATIC(CommandCallback), false);
    1.34  		}
    1.35  
    1.36  		pInfo->pCmd = pCmd;