1.1 --- a/core/sourcemod.cpp	Sat Mar 16 18:05:22 2013 -0400
     1.2 +++ b/core/sourcemod.cpp	Sat Mar 16 22:15:25 2013 -0400
     1.3 @@ -244,7 +244,7 @@
     1.4  	g_pSourcePawn2->SetDebugListener(logicore.debugger);
     1.5  
     1.6  	/* Hook this now so we can detect startup without calling StartSourceMod() */
     1.7 -	SH_ADD_HOOK_MEMFUNC(IServerGameDLL, LevelInit, gamedll, this, &SourceModBase::LevelInit, false);
     1.8 +	SH_ADD_HOOK(IServerGameDLL, LevelInit, gamedll, SH_MEMBER(this, &SourceModBase::LevelInit), false);
     1.9  
    1.10  	/* Only load if we're not late */
    1.11  	if (!late)
    1.12 @@ -257,8 +257,8 @@
    1.13  
    1.14  void SourceModBase::StartSourceMod(bool late)
    1.15  {
    1.16 -	SH_ADD_HOOK_MEMFUNC(IServerGameDLL, LevelShutdown, gamedll, this, &SourceModBase::LevelShutdown, false);
    1.17 -	SH_ADD_HOOK_MEMFUNC(IServerGameDLL, GameFrame, gamedll, &g_Timers, &TimerSystem::GameFrame, false);
    1.18 +	SH_ADD_HOOK(IServerGameDLL, LevelShutdown, gamedll, SH_MEMBER(this, &SourceModBase::LevelShutdown), false);
    1.19 +	SH_ADD_HOOK(IServerGameDLL, GameFrame, gamedll, SH_MEMBER(&g_Timers, &TimerSystem::GameFrame), false);
    1.20  
    1.21  	enginePatch = SH_GET_CALLCLASS(engine);
    1.22  	gamedllPatch = SH_GET_CALLCLASS(gamedll);
    1.23 @@ -489,7 +489,7 @@
    1.24  	/* Unload extensions */
    1.25  	g_Extensions.Shutdown();
    1.26  
    1.27 -	SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, LevelInit, gamedll, this, &SourceModBase::LevelInit, false);
    1.28 +	SH_REMOVE_HOOK(IServerGameDLL, LevelInit, gamedll, SH_MEMBER(this, &SourceModBase::LevelInit), false);
    1.29  
    1.30  	if (g_Loaded)
    1.31  	{
    1.32 @@ -536,8 +536,8 @@
    1.33  			gamedllPatch = NULL;
    1.34  		}
    1.35  
    1.36 -		SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, LevelShutdown, gamedll, this, &SourceModBase::LevelShutdown, false);
    1.37 -		SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, GameFrame, gamedll, &g_Timers, &TimerSystem::GameFrame, false);
    1.38 +		SH_REMOVE_HOOK(IServerGameDLL, LevelShutdown, gamedll, SH_MEMBER(this, &SourceModBase::LevelShutdown), false);
    1.39 +		SH_REMOVE_HOOK(IServerGameDLL, GameFrame, gamedll, SH_MEMBER(&g_Timers, &TimerSystem::GameFrame), false);
    1.40  	}
    1.41  
    1.42  	/* Rest In Peace */