[7552] Move client version dependend DBC code to src/game. Author: VladimirMangos

--HG--
branch : trunk

src/bindings/scripts/ScriptMgr.cpp

@@ -5,7 +5,7 @@
 #include "precompiled.h"
 #include "Config/Config.h"
 #include "Database/DatabaseEnv.h"
-#include "Database/DBCStores.h"
+#include "DBCStores.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
 #include "scripts/creature/mob_event_ai.h"

src/bindings/scripts/ScriptMgr.h

@@ -10,7 +10,7 @@
 
 #include "Common.h"
 #include "Platform/CompilerDefs.h"
-#include "Database/DBCStructure.h"
+#include "DBCStructure.h"
 
 class Player;
 class Creature;

src/game/AchievementMgr.cpp

@@ -20,7 +20,7 @@
 #include "Common.h"
 #include "Player.h"
 #include "WorldPacket.h"
-#include "Database/DBCEnums.h"
+#include "DBCEnums.h"
 #include "GameEventMgr.h"
 #include "ObjectMgr.h"
 #include "Guild.h"

src/game/AchievementMgr.h

@@ -20,9 +20,9 @@
 
 #include "Common.h"
 #include "Policies/Singleton.h"
-#include "Database/DBCEnums.h"
-#include "Database/DBCStores.h"
 #include "Database/DatabaseEnv.h"
+#include "DBCEnums.h"
+#include "DBCStores.h"
 
 #include <map>
 #include <string>

src/game/AuctionHouseMgr.cpp

@@ -18,8 +18,8 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "Database/DBCStores.h"
 #include "Database/SQLStorage.h"
+#include "DBCStores.h"
 #include "ProgressBar.h"
 
 #include "AccountMgr.h"

src/game/HostilRefManager.cpp

@@ -21,7 +21,7 @@
 #include "HostilRefManager.h"
 #include "ThreatManager.h"
 #include "Unit.h"
-#include "Database/DBCStructure.h"
+#include "DBCStructure.h"
 #include "SpellMgr.h"
 
 HostilRefManager::~HostilRefManager()

src/game/Mail.cpp

@@ -29,8 +29,8 @@
 #include "UpdateMask.h"
 #include "Unit.h"
 #include "Language.h"
-#include "Database/DBCStores.h"
 #include "AuctionHouseBot.h"
+#include "DBCStores.h"
 
 void MailItem::deleteItem( bool inDB )
 {

src/game/Makefile.am

@@ -380,6 +380,11 @@ libmangosgame_a_SOURCES = \
 	CreatureAISelector.h \
 	Creature.cpp \
 	Creature.h \
+	DBCEnums.h \
+	DBCfmt.h \
+	DBCStores.cpp \
+	DBCStores.h \
+	DBCStructure.h	\
 	debugcmds.cpp \
 	DestinationHolder.cpp \
 	DestinationHolder.h \

src/game/Map.h

@@ -26,7 +26,7 @@
 #include "zthread/Lockable.h"
 #include "zthread/Mutex.h"
 #include "zthread/FairReadWriteLock.h"
-#include "Database/DBCStructure.h"
+#include "DBCStructure.h"
 #include "GridDefines.h"
 #include "Cell.h"
 #include "Timer.h"

src/game/OutdoorPvPEP.h

@@ -21,7 +21,7 @@
 
 #include "OutdoorPvP.h"
 
-#include "Database/DBCStructure.h"
+#include "DBCStructure.h"
 
 const uint32 EP_AllianceBuffs[4] = {11413, 11414, 11415, 1386};
 

src/game/PetAI.cpp

@@ -22,7 +22,7 @@
 #include "Errors.h"
 #include "Pet.h"
 #include "Player.h"
-#include "Database/DBCStores.h"
+#include "DBCStores.h"
 #include "Spell.h"
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"

src/game/ReputationMgr.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "ReputationMgr.h"
-#include "Database/DBCStores.h"
+#include "DBCStores.h"
 #include "Player.h"
 #include "WorldPacket.h"
 

src/game/ReputationMgr.h

@@ -21,7 +21,7 @@
 
 #include "Common.h"
 #include "SharedDefines.h"
-#include "Database/DBCStructure.h"
+#include "DBCStructure.h"
 #include <map>
 
 enum FactionFlags

src/game/SpellHandler.cpp

@@ -19,7 +19,7 @@
  */
 
 #include "Common.h"
-#include "Database/DBCStores.h"
+#include "DBCStores.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "ObjectMgr.h"

src/game/SpellMgr.cpp

@@ -22,7 +22,7 @@
 #include "ObjectMgr.h"
 #include "SpellAuraDefines.h"
 #include "ProgressBar.h"
-#include "Database/DBCStores.h"
+#include "DBCStores.h"
 #include "World.h"
 #include "Chat.h"
 #include "Spell.h"

src/game/SpellMgr.h

@@ -25,7 +25,7 @@
 // For more high level function for sSpellStore data
 
 #include "SharedDefines.h"
-#include "Database/DBCStructure.h"
+#include "DBCStructure.h"
 #include "Database/SQLStorage.h"
 
 #include "Utilities/UnorderedMap.h"

src/game/TotemAI.cpp

@@ -21,7 +21,7 @@
 #include "TotemAI.h"
 #include "Totem.h"
 #include "Creature.h"
-#include "Database/DBCStores.h"
+#include "DBCStores.h"
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"
 

src/game/Transports.cpp

@@ -26,7 +26,7 @@
 #include "Path.h"
 
 #include "WorldPacket.h"
-#include "Database/DBCStores.h"
+#include "DBCStores.h"
 #include "ProgressBar.h"
 
 #include "World.h"

src/game/Unit.h

@@ -33,7 +33,7 @@
 #include "FollowerRefManager.h"
 #include "Utilities/EventProcessor.h"
 #include "MotionMaster.h"
-#include "Database/DBCStructure.h"
+#include "DBCStructure.h"
 #include <list>
 
 #define WORLD_TRIGGER   12999

src/game/World.cpp

@@ -42,7 +42,7 @@
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
 #include "Chat.h"
-#include "Database/DBCStores.h"
+#include "DBCStores.h"
 #include "LootMgr.h"
 #include "ItemEnchantmentMgr.h"
 #include "MapManager.h"

src/shared/Database/DatabaseEnv.h

@@ -25,7 +25,6 @@
 #include "Log.h"
 #include "Errors.h"
 
-#include "Database/DBCStores.h"
 #include "Database/Field.h"
 #include "Database/QueryResult.h"
 

src/shared/Database/Makefile.am

@@ -29,10 +29,9 @@ AM_CPPFLAGS = $(TRINI_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(src
 noinst_LIBRARIES = libmangosdatabase.a
 
 libmangosdatabase_a_SOURCES = \
-	DBCStores.cpp \
-	DBCStores.h \
-	DBCStructure.h \
-	DBCfmt.cpp \
+	DBCFileLoader.cpp \
+	DBCFileLoader.h \
+	DBCStore.h \
 	Database.cpp \
 	Database.h \
 	DatabaseEnv.h \
@@ -61,6 +60,4 @@ libmangosdatabase_a_SOURCES = \
 	SqlDelayThread.cpp \
 	SqlDelayThread.h \
 	SqlOperations.cpp \
-	SqlOperations.h \
-	dbcfile.cpp \
-	dbcfile.h
+	SqlOperations.h

src/shared/Database/SQLStorageImpl.h

@@ -18,7 +18,7 @@
 
 #include "ProgressBar.h"
 #include "Log.h"
-#include "dbcfile.h"
+#include "DBCFileLoader.h"
 
 template<class T>
 template<class S, class D>