From 9027d152118928c783a3e289210768e18626c274 Mon Sep 17 00:00:00 2001
From: Nicholas Hastings <skamonkey@gmail.com>
Date: Wed, 9 Oct 2013 08:43:08 -0400
Subject: [PATCH] Move ADTFactory from core to logic (bug 5953, r=fyren).

--HG--
rename : core/ADTFactory.cpp => core/logic/ADTFactory.cpp
rename : core/ADTFactory.h => core/logic/ADTFactory.h
---
 core/AMBuilder                  | 1 -
 core/{ => logic}/ADTFactory.cpp | 5 ++---
 core/{ => logic}/ADTFactory.h   | 2 +-
 core/logic/AMBuilder            | 1 +
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename core/{ => logic}/ADTFactory.cpp (92%)
 rename core/{ => logic}/ADTFactory.h (96%)

diff --git a/core/AMBuilder b/core/AMBuilder
index 12c2db2a..0962ada0 100644
--- a/core/AMBuilder
+++ b/core/AMBuilder
@@ -61,7 +61,6 @@ for i in SM.sdkInfo:
 		'logic_bridge.cpp',
 		'smn_entities.cpp',
 		'sm_stringutil.cpp',
-		'ADTFactory.cpp',
 		'ForwardSys.cpp',
 		'MenuVoting.cpp',
 		'smn_events.cpp',
diff --git a/core/ADTFactory.cpp b/core/logic/ADTFactory.cpp
similarity index 92%
rename from core/ADTFactory.cpp
rename to core/logic/ADTFactory.cpp
index cd761b6a..de82b483 100644
--- a/core/ADTFactory.cpp
+++ b/core/logic/ADTFactory.cpp
@@ -30,8 +30,7 @@
  */
 
 #include "ADTFactory.h"
-#include "sm_globals.h"
-#include "logic_bridge.h"
+#include "ShareSys.h"
 
 ADTFactory g_AdtFactory;
 
@@ -47,7 +46,7 @@ unsigned int ADTFactory::GetInterfaceVersion()
 
 void ADTFactory::OnSourceModAllInitialized()
 {
-	sharesys->AddInterface(NULL, this);
+	g_ShareSys.AddInterface(NULL, this);
 }
 
 IBasicTrie *ADTFactory::CreateBasicTrie()
diff --git a/core/ADTFactory.h b/core/logic/ADTFactory.h
similarity index 96%
rename from core/ADTFactory.h
rename to core/logic/ADTFactory.h
index 8ef3d6a1..bb36faa0 100644
--- a/core/ADTFactory.h
+++ b/core/logic/ADTFactory.h
@@ -33,7 +33,7 @@
 #define _INCLUDE_SOURCEMOD_ADTFACTORY_H_
 
 #include <IADTFactory.h>
-#include "sm_globals.h"
+#include "common_logic.h"
 #include <sm_stringhashmap.h>
 
 using namespace SourceMod;
diff --git a/core/logic/AMBuilder b/core/logic/AMBuilder
index 80bd2e38..c15eb47a 100644
--- a/core/logic/AMBuilder
+++ b/core/logic/AMBuilder
@@ -25,6 +25,7 @@ files = [
 	'smn_adt_array.cpp',
 	'smn_sorting.cpp',
 	'smn_maplists.cpp',
+	'ADTFactory.cpp',
 	'smn_adt_stack.cpp',
 	'thread/ThreadWorker.cpp',
 	'thread/BaseWorker.cpp',