1.1 --- a/core/CoreConfig.cpp	Wed Oct 09 08:43:08 2013 -0400
     1.2 +++ b/core/CoreConfig.cpp	Wed Oct 09 08:43:08 2013 -0400
     1.3 @@ -38,7 +38,6 @@
     1.4  #include "sm_stringutil.h"
     1.5  #include "LibrarySys.h"
     1.6  #include "Logger.h"
     1.7 -#include "ForwardSys.h"
     1.8  #include "frame_hooks.h"
     1.9  #include "logic_bridge.h"
    1.10  
    1.11 @@ -119,9 +118,9 @@
    1.12  void CoreConfig::OnSourceModAllInitialized()
    1.13  {
    1.14  	g_RootMenu.AddRootConsoleCommand("config", "Set core configuration options", this);
    1.15 -	g_pOnServerCfg = g_Forwards.CreateForward("OnServerCfg", ET_Ignore, 0, NULL);
    1.16 -	g_pOnConfigsExecuted = g_Forwards.CreateForward("OnConfigsExecuted", ET_Ignore, 0, NULL);
    1.17 -	g_pOnAutoConfigsBuffered = g_Forwards.CreateForward("OnAutoConfigsBuffered", ET_Ignore, 0, NULL);
    1.18 +	g_pOnServerCfg = forwardsys->CreateForward("OnServerCfg", ET_Ignore, 0, NULL);
    1.19 +	g_pOnConfigsExecuted = forwardsys->CreateForward("OnConfigsExecuted", ET_Ignore, 0, NULL);
    1.20 +	g_pOnAutoConfigsBuffered = forwardsys->CreateForward("OnAutoConfigsBuffered", ET_Ignore, 0, NULL);
    1.21  }
    1.22  
    1.23  CoreConfig::CoreConfig()
    1.24 @@ -135,9 +134,9 @@
    1.25  void CoreConfig::OnSourceModShutdown()
    1.26  {
    1.27  	g_RootMenu.RemoveRootConsoleCommand("config", this);
    1.28 -	g_Forwards.ReleaseForward(g_pOnServerCfg);
    1.29 -	g_Forwards.ReleaseForward(g_pOnConfigsExecuted);
    1.30 -	g_Forwards.ReleaseForward(g_pOnAutoConfigsBuffered);
    1.31 +	forwardsys->ReleaseForward(g_pOnServerCfg);
    1.32 +	forwardsys->ReleaseForward(g_pOnConfigsExecuted);
    1.33 +	forwardsys->ReleaseForward(g_pOnAutoConfigsBuffered);
    1.34  
    1.35  	if (g_pExecPtr != NULL)
    1.36  	{