1.1 --- a/core/ConVarManager.cpp	Sat Mar 16 18:05:22 2013 -0400
     1.2 +++ b/core/ConVarManager.cpp	Sat Mar 16 22:15:25 2013 -0400
     1.3 @@ -121,12 +121,12 @@
     1.4  #if SOURCE_ENGINE == SE_EPISODEONE
     1.5  	if (g_SMAPI->GetGameDLLVersion() >= 6)
     1.6  	{
     1.7 -		SH_ADD_HOOK_MEMFUNC(IServerGameDLL, OnQueryCvarValueFinished, gamedll, this, &ConVarManager::OnQueryCvarValueFinished, false);
     1.8 +		SH_ADD_HOOK(IServerGameDLL, OnQueryCvarValueFinished, gamedll, SH_MEMBER(this, &ConVarManager::OnQueryCvarValueFinished), false);
     1.9  		m_bIsDLLQueryHooked = true;
    1.10  	}
    1.11  #endif
    1.12  
    1.13 -	SH_ADD_HOOK_STATICFUNC(ICvar, CallGlobalChangeCallbacks, icvar, OnConVarChanged, false);
    1.14 +	SH_ADD_HOOK(ICvar, CallGlobalChangeCallbacks, icvar, SH_STATIC(OnConVarChanged), false);
    1.15  
    1.16  	g_PluginSys.AddPluginsListener(this);
    1.17  
    1.18 @@ -181,17 +181,17 @@
    1.19  	/* Unhook things */
    1.20  	if (m_bIsDLLQueryHooked)
    1.21  	{
    1.22 -		SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, OnQueryCvarValueFinished, gamedll, this, &ConVarManager::OnQueryCvarValueFinished, false);
    1.23 +		SH_REMOVE_HOOK(IServerGameDLL, OnQueryCvarValueFinished, gamedll, SH_MEMBER(this, &ConVarManager::OnQueryCvarValueFinished), false);
    1.24  		m_bIsDLLQueryHooked = false;
    1.25  	}
    1.26  	else if (m_bIsVSPQueryHooked)
    1.27  	{
    1.28 -		SH_REMOVE_HOOK_MEMFUNC(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, this, &ConVarManager::OnQueryCvarValueFinished, false);
    1.29 +		SH_REMOVE_HOOK(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, SH_MEMBER(this, &ConVarManager::OnQueryCvarValueFinished), false);
    1.30  		m_bIsVSPQueryHooked = false;
    1.31  	}
    1.32  #endif
    1.33  
    1.34 -	SH_REMOVE_HOOK_STATICFUNC(ICvar, CallGlobalChangeCallbacks, icvar, OnConVarChanged, false);
    1.35 +	SH_REMOVE_HOOK(ICvar, CallGlobalChangeCallbacks, icvar, SH_STATIC(OnConVarChanged), false);
    1.36  
    1.37  	/* Remove the 'convars' option from the 'sm' console command */
    1.38  	g_RootMenu.RemoveRootConsoleCommand("cvars", this);
    1.39 @@ -230,7 +230,7 @@
    1.40  #endif
    1.41  
    1.42  #if SOURCE_ENGINE != SE_DARKMESSIAH
    1.43 -	SH_ADD_HOOK_MEMFUNC(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, this, &ConVarManager::OnQueryCvarValueFinished, false);
    1.44 +	SH_ADD_HOOK(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, SH_MEMBER(this, &ConVarManager::OnQueryCvarValueFinished), false);
    1.45  	m_bIsVSPQueryHooked = true;
    1.46  #endif
    1.47  }