1.1 --- a/core/PlayerManager.cpp	Wed Oct 09 08:43:08 2013 -0400
     1.2 +++ b/core/PlayerManager.cpp	Wed Oct 09 08:43:08 2013 -0400
     1.3 @@ -30,7 +30,6 @@
     1.4   */
     1.5  
     1.6  #include "PlayerManager.h"
     1.7 -#include "ForwardSys.h"
     1.8  #include "AdminCache.h"
     1.9  #include "ConCmdManager.h"
    1.10  #include "MenuStyle_Valve.h"
    1.11 @@ -159,20 +158,20 @@
    1.12  	ParamType p1[] = {Param_Cell, Param_String, Param_Cell};
    1.13  	ParamType p2[] = {Param_Cell};
    1.14  
    1.15 -	m_clconnect = g_Forwards.CreateForward("OnClientConnect", ET_LowEvent, 3, p1);
    1.16 -	m_clconnect_post = g_Forwards.CreateForward("OnClientConnected", ET_Ignore, 1, p2);
    1.17 -	m_clputinserver = g_Forwards.CreateForward("OnClientPutInServer", ET_Ignore, 1, p2);
    1.18 -	m_cldisconnect = g_Forwards.CreateForward("OnClientDisconnect", ET_Ignore, 1, p2);
    1.19 -	m_cldisconnect_post = g_Forwards.CreateForward("OnClientDisconnect_Post", ET_Ignore, 1, p2);
    1.20 -	m_clcommand = g_Forwards.CreateForward("OnClientCommand", ET_Hook, 2, NULL, Param_Cell, Param_Cell);
    1.21 -	m_clinfochanged = g_Forwards.CreateForward("OnClientSettingsChanged", ET_Ignore, 1, p2);
    1.22 -	m_clauth = g_Forwards.CreateForward("OnClientAuthorized", ET_Ignore, 2, NULL, Param_Cell, Param_String);
    1.23 -	m_onActivate = g_Forwards.CreateForward("OnServerLoad", ET_Ignore, 0, NULL);
    1.24 -	m_onActivate2 = g_Forwards.CreateForward("OnMapStart", ET_Ignore, 0, NULL);
    1.25 +	m_clconnect = forwardsys->CreateForward("OnClientConnect", ET_LowEvent, 3, p1);
    1.26 +	m_clconnect_post = forwardsys->CreateForward("OnClientConnected", ET_Ignore, 1, p2);
    1.27 +	m_clputinserver = forwardsys->CreateForward("OnClientPutInServer", ET_Ignore, 1, p2);
    1.28 +	m_cldisconnect = forwardsys->CreateForward("OnClientDisconnect", ET_Ignore, 1, p2);
    1.29 +	m_cldisconnect_post = forwardsys->CreateForward("OnClientDisconnect_Post", ET_Ignore, 1, p2);
    1.30 +	m_clcommand = forwardsys->CreateForward("OnClientCommand", ET_Hook, 2, NULL, Param_Cell, Param_Cell);
    1.31 +	m_clinfochanged = forwardsys->CreateForward("OnClientSettingsChanged", ET_Ignore, 1, p2);
    1.32 +	m_clauth = forwardsys->CreateForward("OnClientAuthorized", ET_Ignore, 2, NULL, Param_Cell, Param_String);
    1.33 +	m_onActivate = forwardsys->CreateForward("OnServerLoad", ET_Ignore, 0, NULL);
    1.34 +	m_onActivate2 = forwardsys->CreateForward("OnMapStart", ET_Ignore, 0, NULL);
    1.35  
    1.36 -	PreAdminCheck = g_Forwards.CreateForward("OnClientPreAdminCheck", ET_Event, 1, p1);
    1.37 -	PostAdminCheck = g_Forwards.CreateForward("OnClientPostAdminCheck", ET_Ignore, 1, p1);
    1.38 -	PostAdminFilter = g_Forwards.CreateForward("OnClientPostAdminFilter", ET_Ignore, 1, p1);
    1.39 +	PreAdminCheck = forwardsys->CreateForward("OnClientPreAdminCheck", ET_Event, 1, p1);
    1.40 +	PostAdminCheck = forwardsys->CreateForward("OnClientPostAdminCheck", ET_Ignore, 1, p1);
    1.41 +	PostAdminFilter = forwardsys->CreateForward("OnClientPostAdminFilter", ET_Ignore, 1, p1);
    1.42  
    1.43  	m_bIsListenServer = !engine->IsDedicatedServer();
    1.44  	m_ListenClient = 0;
    1.45 @@ -197,20 +196,20 @@
    1.46  	SH_REMOVE_HOOK(IServerGameDLL, ServerActivate, gamedll, SH_MEMBER(this, &PlayerManager::OnServerActivate), true);
    1.47  
    1.48  	/* Release forwards */
    1.49 -	g_Forwards.ReleaseForward(m_clconnect);
    1.50 -	g_Forwards.ReleaseForward(m_clconnect_post);
    1.51 -	g_Forwards.ReleaseForward(m_clputinserver);
    1.52 -	g_Forwards.ReleaseForward(m_cldisconnect);
    1.53 -	g_Forwards.ReleaseForward(m_cldisconnect_post);
    1.54 -	g_Forwards.ReleaseForward(m_clcommand);
    1.55 -	g_Forwards.ReleaseForward(m_clinfochanged);
    1.56 -	g_Forwards.ReleaseForward(m_clauth);
    1.57 -	g_Forwards.ReleaseForward(m_onActivate);
    1.58 -	g_Forwards.ReleaseForward(m_onActivate2);
    1.59 +	forwardsys->ReleaseForward(m_clconnect);
    1.60 +	forwardsys->ReleaseForward(m_clconnect_post);
    1.61 +	forwardsys->ReleaseForward(m_clputinserver);
    1.62 +	forwardsys->ReleaseForward(m_cldisconnect);
    1.63 +	forwardsys->ReleaseForward(m_cldisconnect_post);
    1.64 +	forwardsys->ReleaseForward(m_clcommand);
    1.65 +	forwardsys->ReleaseForward(m_clinfochanged);
    1.66 +	forwardsys->ReleaseForward(m_clauth);
    1.67 +	forwardsys->ReleaseForward(m_onActivate);
    1.68 +	forwardsys->ReleaseForward(m_onActivate2);
    1.69  
    1.70 -	g_Forwards.ReleaseForward(PreAdminCheck);
    1.71 -	g_Forwards.ReleaseForward(PostAdminCheck);
    1.72 -	g_Forwards.ReleaseForward(PostAdminFilter);
    1.73 +	forwardsys->ReleaseForward(PreAdminCheck);
    1.74 +	forwardsys->ReleaseForward(PostAdminCheck);
    1.75 +	forwardsys->ReleaseForward(PostAdminFilter);
    1.76  
    1.77  	delete [] m_Players;
    1.78