diff options
34 files changed, 53 insertions, 53 deletions
diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp index e1488e2390c..b38bcb54ff8 100644 --- a/src/server/game/Entities/Item/Container/Bag.cpp +++ b/src/server/game/Entities/Item/Container/Bag.cpp @@ -20,11 +20,11 @@ #include "Common.h" #include "ObjectMgr.h" -#include "Database/DatabaseEnv.h" +#include "DatabaseEnv.h" #include "Bag.h" -#include "Logging/Log.h" -#include "Entities/Object/Updates/UpdateData.h" +#include "Log.h" +#include "UpdateData.h" Bag::Bag(): Item() { diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index d6b07ecac01..d0be9199259 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -21,8 +21,8 @@ #include "Common.h" #include "Item.h" #include "ObjectMgr.h" -#include "Packets/WorldPacket.h" -#include "Database/DatabaseEnv.h" +#include "WorldPacket.h" +#include "DatabaseEnv.h" #include "ItemEnchantmentMgr.h" #include "SpellMgr.h" #include "ScriptMgr.h" diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp index 8594ea864ba..5d8d6ef25ce 100644 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp @@ -21,7 +21,7 @@ #include <stdlib.h> #include <functional> #include "ItemEnchantmentMgr.h" -#include "Database/DatabaseEnv.h" +#include "DatabaseEnv.h" #include "Log.h" #include "ObjectMgr.h" #include "ProgressBar.h" diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h index eb10696a26e..e560db842f5 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.h +++ b/src/server/game/Entities/Object/Updates/UpdateData.h @@ -21,7 +21,7 @@ #ifndef __UPDATEDATA_H #define __UPDATEDATA_H -#include "Packets/ByteBuffer.h" +#include "ByteBuffer.h" class WorldPacket; enum OBJECT_UPDATE_TYPE diff --git a/src/server/game/Entities/Object/Updates/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h index 9db2fcecbcc..527bec42aa7 100644 --- a/src/server/game/Entities/Object/Updates/UpdateMask.h +++ b/src/server/game/Entities/Object/Updates/UpdateMask.h @@ -22,7 +22,7 @@ #define __UPDATEMASK_H #include "UpdateFields.h" -#include "Debugging/Errors.h" +#include "Errors.h" class UpdateMask { diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 45b07e7bd96..51f5d43c3d8 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -19,7 +19,7 @@ */ #include "Common.h" -#include "Database/DatabaseEnv.h" +#include "DatabaseEnv.h" #include "Log.h" #include "WorldPacket.h" #include "ObjectMgr.h" diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 7ee5248dd54..c79ce17f40e 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -20,7 +20,7 @@ #include "Common.h" #include "Language.h" -#include "Database/DatabaseEnv.h" +#include "DatabaseEnv.h" #include "Log.h" #include "Opcodes.h" #include "SpellMgr.h" @@ -59,7 +59,7 @@ #include "OutdoorPvPMgr.h" #include "ArenaTeam.h" #include "Chat.h" -#include "Database/DatabaseImpl.h" +#include "DatabaseImpl.h" #include "Spell.h" #include "SocialMgr.h" #include "GameEventMgr.h" diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp index f0f27691007..a64692895a3 100644 --- a/src/server/game/Entities/Player/SocialMgr.cpp +++ b/src/server/game/Entities/Player/SocialMgr.cpp @@ -19,8 +19,8 @@ */ #include "SocialMgr.h" -#include "Policies/SingletonImp.h" -#include "Database/DatabaseEnv.h" +#include "SingletonImp.h" +#include "DatabaseEnv.h" #include "Opcodes.h" #include "WorldPacket.h" #include "Player.h" diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h index 40f0066ec2e..092ab09dc15 100644 --- a/src/server/game/Entities/Player/SocialMgr.h +++ b/src/server/game/Entities/Player/SocialMgr.h @@ -21,8 +21,8 @@ #ifndef __TRINITY_SOCIALMGR_H #define __TRINITY_SOCIALMGR_H -#include "Policies/Singleton.h" -#include "Database/DatabaseEnv.h" +#include "Singleton.h" +#include "DatabaseEnv.h" #include "Common.h" class SocialMgr; diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index a2c6f2f2422..25cd624b3c5 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -27,7 +27,7 @@ #include "Language.h" #include "Log.h" #include "MapManager.h" -#include "Policies/SingletonImp.h" +#include "SingletonImp.h" #include "GossipDef.h" #include "Player.h" #include "BattleGroundMgr.h" diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index d0e288fd77e..21178805859 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -24,7 +24,7 @@ #include "Common.h" #include "SharedDefines.h" #include "Define.h" -#include "Policies/Singleton.h" +#include "Singleton.h" #define max_ge_check_delay DAY // 1 day in seconds diff --git a/src/server/game/Globals/GlobalEvents.cpp b/src/server/game/Globals/GlobalEvents.cpp index 69895e14f5a..acdd91248bc 100644 --- a/src/server/game/Globals/GlobalEvents.cpp +++ b/src/server/game/Globals/GlobalEvents.cpp @@ -23,8 +23,8 @@ */ #include "Log.h" -#include "Database/DatabaseEnv.h" -#include "Database/DatabaseImpl.h" +#include "DatabaseEnv.h" +#include "DatabaseImpl.h" #include "Define.h" #include "MapManager.h" #include "ObjectAccessor.h" diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index cf5bc728c6e..73aca9865f8 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -20,7 +20,7 @@ #include "ObjectAccessor.h" #include "ObjectMgr.h" -#include "Policies/SingletonImp.h" +#include "SingletonImp.h" #include "Player.h" #include "Creature.h" #include "GameObject.h" diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 07e2607d13c..5f460c7e84c 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -19,10 +19,10 @@ */ #include "Common.h" -#include "Database/DatabaseEnv.h" -#include "Database/SQLStorage.h" -#include "Database/SQLStorageImpl.h" -#include "Policies/SingletonImp.h" +#include "DatabaseEnv.h" +#include "SQLStorage.h" +#include "SQLStorageImpl.h" +#include "SingletonImp.h" #include "Log.h" #include "MapManager.h" diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 79b6ffdd0eb..c1471aa0680 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -33,13 +33,13 @@ #include "Path.h" #include "ItemPrototype.h" #include "NPCHandler.h" -#include "Database/DatabaseEnv.h" +#include "DatabaseEnv.h" #include "Mail.h" #include "Map.h" #include "ObjectAccessor.h" #include "ObjectDefines.h" -#include "Policies/Singleton.h" -#include "Database/SQLStorage.h" +#include "Singleton.h" +#include "SQLStorage.h" #include "Vehicle.h" #include "ObjectMgr.h" #include <string> diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h index 4cc1e0864ba..4bc08e3b1b9 100644 --- a/src/server/game/Grids/Cells/Cell.h +++ b/src/server/game/Grids/Cells/Cell.h @@ -23,8 +23,8 @@ #include <cmath> -#include "Dynamic/TypeContainer.h" -#include "Dynamic/TypeContainerVisitor.h" +#include "TypeContainer.h" +#include "TypeContainerVisitor.h" #include "GridDefines.h" diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h index 0085bc70152..fd2cc28c184 100644 --- a/src/server/game/Grids/Grid.h +++ b/src/server/game/Grids/Grid.h @@ -33,9 +33,9 @@ */ #include "Define.h" -#include "Policies/ThreadingModel.h" -#include "Dynamic/TypeContainer.h" -#include "Dynamic/TypeContainerVisitor.h" +#include "ThreadingModel.h" +#include "TypeContainer.h" +#include "TypeContainerVisitor.h" // forward declaration template<class A, class T, class O> class GridLoader; diff --git a/src/server/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h index 191ace29d34..ca80451e023 100644 --- a/src/server/game/Grids/GridLoader.h +++ b/src/server/game/Grids/GridLoader.h @@ -34,7 +34,7 @@ #include "Define.h" #include "Grid.h" -#include "Dynamic/TypeContainerVisitor.h" +#include "TypeContainerVisitor.h" template < diff --git a/src/server/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h index 8f3430a0b4a..44a6c9b802c 100644 --- a/src/server/game/Grids/GridRefManager.h +++ b/src/server/game/Grids/GridRefManager.h @@ -21,7 +21,7 @@ #ifndef _GRIDREFMANAGER #define _GRIDREFMANAGER -#include "Dynamic/LinkedReference/RefManager.h" +#include "RefManager.h" template<class OBJECT> class GridReference; diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h index ac7c8e154b2..63e3817c7d3 100644 --- a/src/server/game/Grids/GridReference.h +++ b/src/server/game/Grids/GridReference.h @@ -21,7 +21,7 @@ #ifndef _GRIDREFERENCE_H #define _GRIDREFERENCE_H -#include "Dynamic/LinkedReference/Reference.h" +#include "Reference.h" template<class OBJECT> class GridRefManager; diff --git a/src/server/game/Groups/GroupRefManager.h b/src/server/game/Groups/GroupRefManager.h index f80e8d0989a..19c4c8122c1 100644 --- a/src/server/game/Groups/GroupRefManager.h +++ b/src/server/game/Groups/GroupRefManager.h @@ -21,7 +21,7 @@ #ifndef _GROUPREFMANAGER #define _GROUPREFMANAGER -#include "Dynamic/LinkedReference/RefManager.h" +#include "RefManager.h" class Group; class Player; diff --git a/src/server/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h index 530f6dd8f10..d2c50688113 100644 --- a/src/server/game/Groups/GroupReference.h +++ b/src/server/game/Groups/GroupReference.h @@ -21,7 +21,7 @@ #ifndef _GROUPREFERENCE_H #define _GROUPREFERENCE_H -#include "Dynamic/LinkedReference/Reference.h" +#include "Reference.h" class Group; class Player; diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 02243776057..f1f3187bc32 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Database/DatabaseEnv.h" +#include "DatabaseEnv.h" #include "WorldPacket.h" #include "WorldSession.h" #include "Player.h" diff --git a/src/server/game/Instances/InstanceData.cpp b/src/server/game/Instances/InstanceData.cpp index 214c5ca2327..5392ad4cbd1 100644 --- a/src/server/game/Instances/InstanceData.cpp +++ b/src/server/game/Instances/InstanceData.cpp @@ -19,7 +19,7 @@ */ #include "InstanceData.h" -#include "Database/DatabaseEnv.h" +#include "DatabaseEnv.h" #include "Map.h" #include "Player.h" #include "GameObject.h" diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index cd024ec6686..c62038cfbf0 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -20,7 +20,7 @@ */ #include "Common.h" -#include "Database/SQLStorage.h" +#include "SQLStorage.h" #include "Player.h" #include "GridNotifiers.h" diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index c8f6c756f2c..3d8bfb70ebf 100644 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -23,12 +23,12 @@ #define __InstanceSaveMgr_H #include "Define.h" -#include "Policies/Singleton.h" +#include "Singleton.h" #include "ace/Thread_Mutex.h" #include <list> #include <map> -#include "Dynamic/UnorderedMap.h" -#include "Database/DatabaseEnv.h" +#include "UnorderedMap.h" +#include "DatabaseEnv.h" #include "DBCEnums.h" #include "ObjectDefines.h" diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 72337452d07..12d7f14090a 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -28,7 +28,7 @@ #include "InstanceData.h" #include "Map.h" #include "GridNotifiersImpl.h" -#include "Configuration/ConfigEnv.h" +#include "ConfigEnv.h" #include "Transport.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 52c79be7038..d2d442ca4cd 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -22,7 +22,7 @@ #define TRINITY_MAP_H #include "Define.h" -#include "Policies/ThreadingModel.h" +#include "ThreadingModel.h" #include "ace/RW_Thread_Mutex.h" #include "ace/Thread_Mutex.h" diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 0585098cae0..42233db4a9a 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -20,8 +20,8 @@ #include "MapManager.h" #include "InstanceSaveMgr.h" -#include "Policies/SingletonImp.h" -#include "Database/DatabaseEnv.h" +#include "SingletonImp.h" +#include "DatabaseEnv.h" #include "Log.h" #include "ObjectAccessor.h" #include "Transport.h" @@ -29,7 +29,7 @@ #include "MapInstanced.h" #include "InstanceData.h" #include "DestinationHolderImp.h" -#include "Configuration/ConfigEnv.h" +#include "ConfigEnv.h" #include "World.h" #include "CellImpl.h" #include "Corpse.h" diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h index f4d7c3c94bc..0fd13f72af2 100644 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapManager.h @@ -22,7 +22,7 @@ #define TRINITY_MAPMANAGER_H #include "Define.h" -#include "Policies/Singleton.h" +#include "Singleton.h" #include "ace/Thread_Mutex.h" #include "Common.h" #include "Map.h" diff --git a/src/server/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h index 8712d343958..2cf38c1b000 100644 --- a/src/server/game/Maps/MapRefManager.h +++ b/src/server/game/Maps/MapRefManager.h @@ -19,7 +19,7 @@ #ifndef _MAPREFMANAGER #define _MAPREFMANAGER -#include "Dynamic/LinkedReference/RefManager.h" +#include "RefManager.h" class MapReference; diff --git a/src/server/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h index c32be406af0..e74fdba229b 100644 --- a/src/server/game/Maps/MapReference.h +++ b/src/server/game/Maps/MapReference.h @@ -19,7 +19,7 @@ #ifndef _MAPREFERENCE_H #define _MAPREFERENCE_H -#include "Dynamic/LinkedReference/Reference.h" +#include "Reference.h" #include "Map.h" class MapReference : public Reference<Map, Player> diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp index f9bb5e2bbbc..5720ed1eb50 100644 --- a/src/server/game/Maps/MapUpdater.cpp +++ b/src/server/game/Maps/MapUpdater.cpp @@ -1,7 +1,7 @@ #include "MapUpdater.h" #include "DelayExecutor.h" #include "Map.h" -#include "Database/DatabaseEnv.h" +#include "DatabaseEnv.h" #include <ace/Guard_T.h> #include <ace/Method_Request.h> diff --git a/src/server/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h index 48cd8db0c36..f301b15ca2f 100644 --- a/src/server/game/Maps/MapUpdater.h +++ b/src/server/game/Maps/MapUpdater.h @@ -4,7 +4,7 @@ #include <ace/Thread_Mutex.h> #include <ace/Condition_Thread_Mutex.h> -#include "Threading/DelayExecutor.h" +#include "DelayExecutor.h" class Map; |