1.1 --- a/core/MenuManager.cpp	Fri Mar 29 12:28:02 2013 -0400
     1.2 +++ b/core/MenuManager.cpp	Fri Mar 29 11:37:29 2013 -0700
     1.3 @@ -38,8 +38,6 @@
     1.4  #include "sourcemm_api.h"
     1.5  #include "PlayerManager.h"
     1.6  #include "MenuStyle_Valve.h"
     1.7 -#include "ShareSys.h"
     1.8 -#include "HandleSys.h"
     1.9  #include "sourcemm_api.h"
    1.10  #include "logic_bridge.h"
    1.11  
    1.12 @@ -56,24 +54,24 @@
    1.13  
    1.14  void MenuManager::OnSourceModAllInitialized()
    1.15  {
    1.16 -	g_ShareSys.AddInterface(NULL, this);
    1.17 +	sharesys->AddInterface(NULL, this);
    1.18  
    1.19  	HandleAccess access;
    1.20 -	g_HandleSys.InitAccessDefaults(NULL, &access);
    1.21 +	handlesys->InitAccessDefaults(NULL, &access);
    1.22  
    1.23  	/* Deny cloning to menus */
    1.24  	access.access[HandleAccess_Clone] = HANDLE_RESTRICT_OWNER|HANDLE_RESTRICT_IDENTITY;
    1.25 -	m_MenuType = g_HandleSys.CreateType("IBaseMenu", this, 0, NULL, &access, g_pCoreIdent, NULL);
    1.26 +	m_MenuType = handlesys->CreateType("IBaseMenu", this, 0, NULL, &access, g_pCoreIdent, NULL);
    1.27  
    1.28  	/* Also deny deletion to styles */
    1.29  	access.access[HandleAccess_Delete] = HANDLE_RESTRICT_OWNER|HANDLE_RESTRICT_IDENTITY;
    1.30 -	m_StyleType = g_HandleSys.CreateType("IMenuStyle", this, 0, NULL, &access, g_pCoreIdent, NULL);
    1.31 +	m_StyleType = handlesys->CreateType("IMenuStyle", this, 0, NULL, &access, g_pCoreIdent, NULL);
    1.32  }
    1.33  
    1.34  void MenuManager::OnSourceModAllShutdown()
    1.35  {
    1.36 -	g_HandleSys.RemoveType(m_MenuType, g_pCoreIdent);
    1.37 -	g_HandleSys.RemoveType(m_StyleType, g_pCoreIdent);
    1.38 +	handlesys->RemoveType(m_MenuType, g_pCoreIdent);
    1.39 +	handlesys->RemoveType(m_StyleType, g_pCoreIdent);
    1.40  }
    1.41  
    1.42  void MenuManager::OnHandleDestroy(HandleType_t type, void *object)
    1.43 @@ -112,7 +110,7 @@
    1.44  		return BAD_HANDLE;
    1.45  	}
    1.46  
    1.47 -	return g_HandleSys.CreateHandle(m_MenuType, menu, pOwner, g_pCoreIdent, NULL);
    1.48 +	return handlesys->CreateHandle(m_MenuType, menu, pOwner, g_pCoreIdent, NULL);
    1.49  }
    1.50  
    1.51  Handle_t MenuManager::CreateStyleHandle(IMenuStyle *style)
    1.52 @@ -122,7 +120,7 @@
    1.53  		return BAD_HANDLE;
    1.54  	}
    1.55  
    1.56 -	return g_HandleSys.CreateHandle(m_StyleType, style, g_pCoreIdent, g_pCoreIdent, NULL);
    1.57 +	return handlesys->CreateHandle(m_StyleType, style, g_pCoreIdent, g_pCoreIdent, NULL);
    1.58  }
    1.59  
    1.60  HandleError MenuManager::ReadMenuHandle(Handle_t handle, IBaseMenu **menu)
    1.61 @@ -132,7 +130,7 @@
    1.62  	sec.pIdentity = g_pCoreIdent;
    1.63  	sec.pOwner = NULL;
    1.64  
    1.65 -	return g_HandleSys.ReadHandle(handle, m_MenuType, &sec, (void **)menu);
    1.66 +	return handlesys->ReadHandle(handle, m_MenuType, &sec, (void **)menu);
    1.67  }
    1.68  
    1.69  HandleError MenuManager::ReadStyleHandle(Handle_t handle, IMenuStyle **style)
    1.70 @@ -142,7 +140,7 @@
    1.71  	sec.pIdentity = g_pCoreIdent;
    1.72  	sec.pOwner = g_pCoreIdent;
    1.73  
    1.74 -	return g_HandleSys.ReadHandle(handle, m_StyleType, &sec, (void **)style);
    1.75 +	return handlesys->ReadHandle(handle, m_StyleType, &sec, (void **)style);
    1.76  }
    1.77  
    1.78  bool MenuManager::SetDefaultStyle(IMenuStyle *style)