1.1 --- a/core/TimerSys.cpp	Wed Oct 09 08:43:08 2013 -0400
     1.2 +++ b/core/TimerSys.cpp	Wed Oct 09 08:43:08 2013 -0400
     1.3 @@ -31,7 +31,6 @@
     1.4  
     1.5  #include <time.h>
     1.6  #include "TimerSys.h"
     1.7 -#include "ForwardSys.h"
     1.8  #include "sourcemm_api.h"
     1.9  #include "frame_hooks.h"
    1.10  #include "ConVarManager.h"
    1.11 @@ -182,8 +181,8 @@
    1.12  void TimerSystem::OnSourceModAllInitialized()
    1.13  {
    1.14  	sharesys->AddInterface(NULL, this);
    1.15 -	m_pOnGameFrame = g_Forwards.CreateForward("OnGameFrame", ET_Ignore, 0, NULL);
    1.16 -	m_pOnMapTimeLeftChanged = g_Forwards.CreateForward("OnMapTimeLeftChanged", ET_Ignore, 0, NULL);
    1.17 +	m_pOnGameFrame = forwardsys->CreateForward("OnGameFrame", ET_Ignore, 0, NULL);
    1.18 +	m_pOnMapTimeLeftChanged = forwardsys->CreateForward("OnMapTimeLeftChanged", ET_Ignore, 0, NULL);
    1.19  }
    1.20  
    1.21  void TimerSystem::OnSourceModGameInitialized()
    1.22 @@ -199,8 +198,8 @@
    1.23  void TimerSystem::OnSourceModShutdown()
    1.24  {
    1.25  	SetMapTimer(NULL);
    1.26 -	g_Forwards.ReleaseForward(m_pOnGameFrame);
    1.27 -	g_Forwards.ReleaseForward(m_pOnMapTimeLeftChanged);
    1.28 +	forwardsys->ReleaseForward(m_pOnGameFrame);
    1.29 +	forwardsys->ReleaseForward(m_pOnMapTimeLeftChanged);
    1.30  }
    1.31  
    1.32  void TimerSystem::OnSourceModLevelEnd()