1.1 --- a/core/NextMap.cpp	Sat Mar 16 18:05:22 2013 -0400
     1.2 +++ b/core/NextMap.cpp	Sat Mar 16 22:15:25 2013 -0400
     1.3 @@ -69,13 +69,13 @@
     1.4  #if SOURCE_ENGINE >= SE_ORANGEBOX
     1.5  	SH_ADD_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
     1.6  #else
     1.7 -	SH_ADD_HOOK_MEMFUNC(IVEngineServer, ChangeLevel, engine, this, &NextMapManager::HookChangeLevel, false);
     1.8 +	SH_ADD_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
     1.9  #endif
    1.10  
    1.11  	ConCommand *pCmd = FindCommand("changelevel");
    1.12  	if (pCmd != NULL)
    1.13  	{
    1.14 -		SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, pCmd, CmdChangeLevelCallback, false);
    1.15 +		SH_ADD_HOOK(ConCommand, Dispatch, pCmd, SH_STATIC(CmdChangeLevelCallback), false);
    1.16  		changeLevelCmd = pCmd;
    1.17  	}
    1.18  }
    1.19 @@ -85,12 +85,12 @@
    1.20  #if SOURCE_ENGINE >= SE_ORANGEBOX
    1.21  	SH_REMOVE_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
    1.22  #else
    1.23 -	SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, ChangeLevel, engine, this, &NextMapManager::HookChangeLevel, false);
    1.24 +	SH_REMOVE_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
    1.25  #endif
    1.26  
    1.27  	if (changeLevelCmd != NULL)
    1.28  	{
    1.29 -		SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, changeLevelCmd, CmdChangeLevelCallback, false);
    1.30 +		SH_REMOVE_HOOK(ConCommand, Dispatch, changeLevelCmd, SH_STATIC(CmdChangeLevelCallback), false);
    1.31  	}
    1.32  
    1.33  	SourceHook::List<MapChangeData *>::iterator iter;