1.1 --- a/core/EventManager.cpp	Sat Mar 16 18:05:22 2013 -0400
     1.2 +++ b/core/EventManager.cpp	Sat Mar 16 22:15:25 2013 -0400
     1.3 @@ -79,8 +79,8 @@
     1.4  void EventManager::OnSourceModAllInitialized()
     1.5  {
     1.6  	/* Add a hook for IGameEventManager2::FireEvent() */
     1.7 -	SH_ADD_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent, false);
     1.8 -	SH_ADD_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent_Post, true);
     1.9 +	SH_ADD_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent), false);
    1.10 +	SH_ADD_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent_Post), true);
    1.11  
    1.12  	HandleAccess sec;
    1.13  
    1.14 @@ -96,8 +96,8 @@
    1.15  void EventManager::OnSourceModShutdown()
    1.16  {
    1.17  	/* Remove hook for IGameEventManager2::FireEvent() */
    1.18 -	SH_REMOVE_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent, false);
    1.19 -	SH_REMOVE_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent_Post, true);
    1.20 +	SH_REMOVE_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent), false);
    1.21 +	SH_REMOVE_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent_Post), true);
    1.22  
    1.23  	/* Remove the 'GameEvent' handle type */
    1.24  	g_HandleSys.RemoveType(m_EventType, g_pCoreIdent);