1.1 --- a/extensions/sdktools/vsound.cpp	Sat Mar 16 18:05:22 2013 -0400
     1.2 +++ b/extensions/sdktools/vsound.cpp	Sat Mar 16 22:15:25 2013 -0400
     1.3 @@ -80,15 +80,15 @@
     1.4  	{
     1.5  		if (m_NormalCount++ == 0)
     1.6  		{
     1.7 -			SH_ADD_HOOK_MEMFUNC(IEngineSound, EmitSound, engsound, this, &SoundHooks::OnEmitSound, false);
     1.8 -			SH_ADD_HOOK_MEMFUNC(IEngineSound, EmitSound, engsound, this, &SoundHooks::OnEmitSound2, false);
     1.9 +			SH_ADD_HOOK(IEngineSound, EmitSound, engsound, SH_MEMBER(this, &SoundHooks::OnEmitSound), false);
    1.10 +			SH_ADD_HOOK(IEngineSound, EmitSound, engsound, SH_MEMBER(this, &SoundHooks::OnEmitSound2), false);
    1.11  		}
    1.12  	}
    1.13  	else if (type == AMBIENT_SOUND_HOOK)
    1.14  	{
    1.15  		if (m_AmbientCount++ == 0)
    1.16  		{
    1.17 -			SH_ADD_HOOK_MEMFUNC(IVEngineServer, EmitAmbientSound, engine, this, &SoundHooks::OnEmitAmbientSound, false);
    1.18 +			SH_ADD_HOOK(IVEngineServer, EmitAmbientSound, engine, SH_MEMBER(this, &SoundHooks::OnEmitAmbientSound), false);
    1.19  		}
    1.20  	}
    1.21  }
    1.22 @@ -99,15 +99,15 @@
    1.23  	{
    1.24  		if (--m_NormalCount == 0)
    1.25  		{
    1.26 -			SH_REMOVE_HOOK_MEMFUNC(IEngineSound, EmitSound, engsound, this, &SoundHooks::OnEmitSound, false);
    1.27 -			SH_REMOVE_HOOK_MEMFUNC(IEngineSound, EmitSound, engsound, this, &SoundHooks::OnEmitSound2, false);
    1.28 +			SH_REMOVE_HOOK(IEngineSound, EmitSound, engsound, SH_MEMBER(this, &SoundHooks::OnEmitSound), false);
    1.29 +			SH_REMOVE_HOOK(IEngineSound, EmitSound, engsound, SH_MEMBER(this, &SoundHooks::OnEmitSound2), false);
    1.30  		}
    1.31  	}
    1.32  	else if (type == AMBIENT_SOUND_HOOK)
    1.33  	{
    1.34  		if (--m_AmbientCount == 0)
    1.35  		{
    1.36 -			SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, EmitAmbientSound, engine, this, &SoundHooks::OnEmitAmbientSound, false);
    1.37 +			SH_REMOVE_HOOK(IVEngineServer, EmitAmbientSound, engine, SH_MEMBER(this, &SoundHooks::OnEmitAmbientSound), false);
    1.38  		}
    1.39  	}
    1.40  }
    1.41 @@ -122,12 +122,12 @@
    1.42  	plsys->RemovePluginsListener(this);
    1.43  	if (m_NormalCount)
    1.44  	{
    1.45 -		SH_REMOVE_HOOK_MEMFUNC(IEngineSound, EmitSound, engsound, this, &SoundHooks::OnEmitSound, false);
    1.46 -		SH_REMOVE_HOOK_MEMFUNC(IEngineSound, EmitSound, engsound, this, &SoundHooks::OnEmitSound2, false);
    1.47 +		SH_REMOVE_HOOK(IEngineSound, EmitSound, engsound, SH_MEMBER(this, &SoundHooks::OnEmitSound), false);
    1.48 +		SH_REMOVE_HOOK(IEngineSound, EmitSound, engsound, SH_MEMBER(this, &SoundHooks::OnEmitSound2), false);
    1.49  	}
    1.50  	if (m_AmbientCount)
    1.51  	{
    1.52 -		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, EmitAmbientSound, engine, this, &SoundHooks::OnEmitAmbientSound, false);
    1.53 +		SH_REMOVE_HOOK(IVEngineServer, EmitAmbientSound, engine, SH_MEMBER(this, &SoundHooks::OnEmitAmbientSound), false);
    1.54  	}
    1.55  }
    1.56