1.1 --- a/core/Database.cpp	Fri Mar 29 12:28:02 2013 -0400
     1.2 +++ b/core/Database.cpp	Fri Mar 29 11:37:29 2013 -0700
     1.3 @@ -30,14 +30,12 @@
     1.4   */
     1.5  
     1.6  #include "Database.h"
     1.7 -#include "HandleSys.h"
     1.8 -#include "ShareSys.h"
     1.9  #include "sourcemod.h"
    1.10  #include "sm_stringutil.h"
    1.11  #include "Logger.h"
    1.12 -#include "ExtensionSys.h"
    1.13  #include <stdlib.h>
    1.14  #include <IThreader.h>
    1.15 +#include "logic_bridge.h"
    1.16  
    1.17  #define DBPARSE_LEVEL_NONE		0
    1.18  #define DBPARSE_LEVEL_MAIN		1
    1.19 @@ -55,14 +53,14 @@
    1.20  {
    1.21  	HandleAccess sec;
    1.22  
    1.23 -	g_HandleSys.InitAccessDefaults(NULL, &sec);
    1.24 +	handlesys->InitAccessDefaults(NULL, &sec);
    1.25  	sec.access[HandleAccess_Delete] |= HANDLE_RESTRICT_IDENTITY;
    1.26  	sec.access[HandleAccess_Clone] |= HANDLE_RESTRICT_IDENTITY;
    1.27  	
    1.28 -	m_DriverType = g_HandleSys.CreateType("IDriver", this, 0, NULL, &sec, g_pCoreIdent, NULL);
    1.29 -	m_DatabaseType = g_HandleSys.CreateType("IDatabase", this, 0, NULL, NULL, g_pCoreIdent, NULL);
    1.30 +	m_DriverType = handlesys->CreateType("IDriver", this, 0, NULL, &sec, g_pCoreIdent, NULL);
    1.31 +	m_DatabaseType = handlesys->CreateType("IDatabase", this, 0, NULL, NULL, g_pCoreIdent, NULL);
    1.32  
    1.33 -	g_ShareSys.AddInterface(NULL, this);
    1.34 +	sharesys->AddInterface(NULL, this);
    1.35  
    1.36  	g_SourceMod.BuildPath(Path_SM, m_Filename, sizeof(m_Filename), "configs/databases.cfg");
    1.37  
    1.38 @@ -70,7 +68,7 @@
    1.39  	m_pThinkLock = g_pThreader->MakeMutex();
    1.40  	m_pQueueLock = g_pThreader->MakeMutex();
    1.41  
    1.42 -	g_PluginSys.AddPluginsListener(this);
    1.43 +	scripts->AddPluginsListener(this);
    1.44  }
    1.45  
    1.46  void DBManager::OnSourceModLevelChange(const char *mapName)
    1.47 @@ -98,12 +96,12 @@
    1.48  void DBManager::OnSourceModShutdown()
    1.49  {
    1.50  	KillWorkerThread();
    1.51 -	g_PluginSys.RemovePluginsListener(this);
    1.52 +	scripts->RemovePluginsListener(this);
    1.53  	m_pConfigLock->DestroyThis();
    1.54  	m_pThinkLock->DestroyThis();
    1.55  	m_pQueueLock->DestroyThis();
    1.56 -	g_HandleSys.RemoveType(m_DatabaseType, g_pCoreIdent);
    1.57 -	g_HandleSys.RemoveType(m_DriverType, g_pCoreIdent);
    1.58 +	handlesys->RemoveType(m_DatabaseType, g_pCoreIdent);
    1.59 +	handlesys->RemoveType(m_DriverType, g_pCoreIdent);
    1.60  	ClearConfigs();
    1.61  }
    1.62  
    1.63 @@ -125,7 +123,7 @@
    1.64  		return;
    1.65  	}
    1.66  
    1.67 -	if (g_HandleSys.TypeCheck(type, m_DatabaseType))
    1.68 +	if (handlesys->TypeCheck(type, m_DatabaseType))
    1.69  	{
    1.70  		IDatabase *pdb = (IDatabase *)object;
    1.71  		pdb->Close();
    1.72 @@ -402,7 +400,7 @@
    1.73  		return BAD_HANDLE;
    1.74  	}
    1.75  
    1.76 -	return g_HandleSys.CreateHandle(type, ptr, pToken, g_pCoreIdent, NULL);
    1.77 +	return handlesys->CreateHandle(type, ptr, pToken, g_pCoreIdent, NULL);
    1.78  }
    1.79  
    1.80  HandleError DBManager::ReadHandle(Handle_t hndl, DBHandleType dtype, void **ptr)
    1.81 @@ -420,13 +418,13 @@
    1.82  
    1.83  	HandleSecurity sec(NULL, g_pCoreIdent);
    1.84  
    1.85 -	return g_HandleSys.ReadHandle(hndl, type, &sec, ptr);
    1.86 +	return handlesys->ReadHandle(hndl, type, &sec, ptr);
    1.87  }
    1.88  
    1.89  HandleError DBManager::ReleaseHandle(Handle_t hndl, DBHandleType type, IdentityToken_t *token)
    1.90  {
    1.91  	HandleSecurity sec(token, g_pCoreIdent);
    1.92 -	return g_HandleSys.FreeHandle(hndl, &sec);
    1.93 +	return handlesys->FreeHandle(hndl, &sec);
    1.94  }
    1.95  
    1.96  unsigned int DBManager::GetDriverCount()
    1.97 @@ -485,7 +483,7 @@
    1.98  	char filename[PLATFORM_MAX_PATH];
    1.99  	UTIL_Format(filename, sizeof(filename), "dbi.%s.ext", name);
   1.100  
   1.101 -	IExtension *pExt = g_Extensions.LoadAutoExtension(filename);
   1.102 +	IExtension *pExt = extsys->LoadAutoExtension(filename);
   1.103  	if (!pExt || !pExt->IsLoaded() || m_drivers.size() <= last_size)
   1.104  	{
   1.105  		return NULL;
   1.106 @@ -729,6 +727,6 @@
   1.107  
   1.108  void DBManager::AddDependency(IExtension *myself, IDBDriver *driver)
   1.109  {
   1.110 -	g_Extensions.AddRawDependency(myself, driver->GetIdentity(), driver);
   1.111 +	extsys->AddRawDependency(myself, driver->GetIdentity(), driver);
   1.112  }
   1.113