diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index b63d27055d..09bbf7955e 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/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" diff --git a/src/bindings/scripts/ScriptMgr.h b/src/bindings/scripts/ScriptMgr.h index 75474cfa2b..7d814c373d 100644 --- a/src/bindings/scripts/ScriptMgr.h +++ b/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; diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index dfd63f4b37..7496be7153 100644 --- a/src/game/AchievementMgr.cpp +++ b/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" diff --git a/src/game/AchievementMgr.h b/src/game/AchievementMgr.h index 83a4317f60..030d053a55 100644 --- a/src/game/AchievementMgr.h +++ b/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 #include diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp index 0e028b6229..f50de441b5 100644 --- a/src/game/AuctionHouseMgr.cpp +++ b/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" diff --git a/src/game/HostilRefManager.cpp b/src/game/HostilRefManager.cpp index aee035ded4..4a51d54248 100644 --- a/src/game/HostilRefManager.cpp +++ b/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() diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp index 8b5c5e5faf..09c9562892 100644 --- a/src/game/Mail.cpp +++ b/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 ) { diff --git a/src/game/Makefile.am b/src/game/Makefile.am index 329ecdaa9c..4c629fcf40 100644 --- a/src/game/Makefile.am +++ b/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 \ diff --git a/src/game/Map.h b/src/game/Map.h index bd3ca891a5..83cb100966 100644 --- a/src/game/Map.h +++ b/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" diff --git a/src/game/OutdoorPvPEP.h b/src/game/OutdoorPvPEP.h index 5ba4591e48..08d31de5cf 100644 --- a/src/game/OutdoorPvPEP.h +++ b/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}; diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp index f218818feb..3ba66bd57a 100644 --- a/src/game/PetAI.cpp +++ b/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" diff --git a/src/game/ReputationMgr.cpp b/src/game/ReputationMgr.cpp index 0ff7020101..15854fef95 100644 --- a/src/game/ReputationMgr.cpp +++ b/src/game/ReputationMgr.cpp @@ -17,7 +17,7 @@ */ #include "ReputationMgr.h" -#include "Database/DBCStores.h" +#include "DBCStores.h" #include "Player.h" #include "WorldPacket.h" diff --git a/src/game/ReputationMgr.h b/src/game/ReputationMgr.h index cb4c85fd5b..b81634119d 100644 --- a/src/game/ReputationMgr.h +++ b/src/game/ReputationMgr.h @@ -21,7 +21,7 @@ #include "Common.h" #include "SharedDefines.h" -#include "Database/DBCStructure.h" +#include "DBCStructure.h" #include enum FactionFlags diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp index e15dd92149..2fd5384d03 100644 --- a/src/game/SpellHandler.cpp +++ b/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" diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index dead7ed3cc..36039c4c04 100644 --- a/src/game/SpellMgr.cpp +++ b/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" diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index 190059f81c..234922fc0b 100644 --- a/src/game/SpellMgr.h +++ b/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" diff --git a/src/game/TotemAI.cpp b/src/game/TotemAI.cpp index a8a049f9dd..cc32d40fda 100644 --- a/src/game/TotemAI.cpp +++ b/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" diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp index ea267f5df4..147f8ce39a 100644 --- a/src/game/Transports.cpp +++ b/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" diff --git a/src/game/Unit.h b/src/game/Unit.h index 80547a7e23..b8d5811035 100644 --- a/src/game/Unit.h +++ b/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 #define WORLD_TRIGGER 12999 diff --git a/src/game/World.cpp b/src/game/World.cpp index 3a2709549e..8aaaeec2dc 100644 --- a/src/game/World.cpp +++ b/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" diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h index 9366d1e007..c915538276 100644 --- a/src/shared/Database/DatabaseEnv.h +++ b/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" diff --git a/src/shared/Database/Makefile.am b/src/shared/Database/Makefile.am index b030fca9b7..6092bdc0e8 100644 --- a/src/shared/Database/Makefile.am +++ b/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 diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h index b7927851fe..b511bdad68 100644 --- a/src/shared/Database/SQLStorageImpl.h +++ b/src/shared/Database/SQLStorageImpl.h @@ -18,7 +18,7 @@ #include "ProgressBar.h" #include "Log.h" -#include "dbcfile.h" +#include "DBCFileLoader.h" template template diff --git a/win/VC71/game.vcproj b/win/VC71/game.vcproj index 0a226b5db4..9431fa8798 100644 --- a/win/VC71/game.vcproj +++ b/win/VC71/game.vcproj @@ -897,6 +897,21 @@ + + + + + + + + + + diff --git a/win/VC71/shared.vcproj b/win/VC71/shared.vcproj index 58421a75b8..163fa41df9 100644 --- a/win/VC71/shared.vcproj +++ b/win/VC71/shared.vcproj @@ -195,34 +195,13 @@ + RelativePath="..\..\src\shared\Database\DBCFileLoader.cpp"> + RelativePath="..\..\src\shared\Database\DBCFileLoader.h"> - - - - - - - - - - - - + RelativePath="..\..\src\shared\Database\DBCStore.h"> diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj index 2d8b79365b..1a43ce4d14 100644 --- a/win/VC80/game.vcproj +++ b/win/VC80/game.vcproj @@ -1331,6 +1331,26 @@ + + + + + + + + + + diff --git a/win/VC80/shared.vcproj b/win/VC80/shared.vcproj index 5964d2502a..8b00f9b760 100644 --- a/win/VC80/shared.vcproj +++ b/win/VC80/shared.vcproj @@ -440,59 +440,15 @@ Name="DataStores" > - - - - - - - - - - - - - - - - - - diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj index 3eabeb0e13..39661291af 100644 --- a/win/VC90/game.vcproj +++ b/win/VC90/game.vcproj @@ -1330,6 +1330,26 @@ + + + + + + + + + + diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj index ff0ebfa41c..8a1d5ee4d9 100644 --- a/win/VC90/shared.vcproj +++ b/win/VC90/shared.vcproj @@ -447,59 +447,15 @@ Name="DataStores" > - - - - - - - - - - - - - - - - - -