1.1 --- a/core/ConsoleDetours.cpp	Wed Oct 09 08:43:08 2013 -0400
     1.2 +++ b/core/ConsoleDetours.cpp	Wed Oct 09 08:43:08 2013 -0400
     1.3 @@ -579,7 +579,7 @@
     1.4  
     1.5  void ConsoleDetours::OnSourceModAllInitialized()
     1.6  {
     1.7 -	m_pForward = g_Forwards.CreateForwardEx("OnAnyCommand", ET_Hook, 3, NULL, Param_Cell,
     1.8 +	m_pForward = forwardsys->CreateForwardEx("OnAnyCommand", ET_Hook, 3, NULL, Param_Cell,
     1.9  	                                        Param_String, Param_Cell);
    1.10  	sharesys->AddCapabilityProvider(NULL, this, FEATURECAP_COMMANDLISTENER);
    1.11  }
    1.12 @@ -590,10 +590,10 @@
    1.13  		 !iter.empty();
    1.14  		 iter.next())
    1.15  	{
    1.16 -		g_Forwards.ReleaseForward(iter->value);
    1.17 +		forwardsys->ReleaseForward(iter->value);
    1.18  	}
    1.19  
    1.20 -	g_Forwards.ReleaseForward(m_pForward);
    1.21 +	forwardsys->ReleaseForward(m_pForward);
    1.22  	s_GenericHooker.Disable();
    1.23  }
    1.24  
    1.25 @@ -626,7 +626,7 @@
    1.26  		IChangeableForward *forward;
    1.27  		if (!m_Listeners.retrieve(str, &forward))
    1.28  		{
    1.29 -			forward = g_Forwards.CreateForwardEx(NULL, ET_Hook, 3, NULL, Param_Cell,
    1.30 +			forward = forwardsys->CreateForwardEx(NULL, ET_Hook, 3, NULL, Param_Cell,
    1.31  			                                     Param_String, Param_Cell);
    1.32  			m_Listeners.insert(str, forward);
    1.33  		}