diff options
18 files changed, 83 insertions, 83 deletions
diff --git a/src/server/game/Chat/Commands/Debugcmds.cpp b/src/server/game/Chat/Commands/Debugcmds.cpp index 247e67ed135..a6c973ea002 100644 --- a/src/server/game/Chat/Commands/Debugcmds.cpp +++ b/src/server/game/Chat/Commands/Debugcmds.cpp @@ -19,23 +19,23 @@ */ #include "Common.h" -#include "Database/DatabaseEnv.h" -#include "Packets/WorldPacket.h" +#include "DatabaseEnv.h" +#include "WorldPacket.h" #include "Vehicle.h" #include "Player.h" -#include "Server/Protocol/Opcodes.h" +#include "Opcodes.h" #include "Chat.h" -#include "Logging/Log.h" +#include "Log.h" #include "Unit.h" #include "GossipDef.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "BattleGroundMgr.h" #include <fstream> #include "ObjectMgr.h" -#include "Grids/Cells/Cell.h" -#include "Grids/Cells/CellImpl.h" -#include "Grids/Notifiers/GridNotifiers.h" -#include "Grids/Notifiers/GridNotifiersImpl.h" +#include "Cell.h" +#include "CellImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "SpellMgr.h" #include "ScriptMgr.h" diff --git a/src/server/game/Chat/Commands/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp index fd6dc165fc6..bed8e3ee23f 100644 --- a/src/server/game/Chat/Commands/Level0.cpp +++ b/src/server/game/Chat/Commands/Level0.cpp @@ -19,17 +19,17 @@ */ #include "Common.h" -#include "Database/DatabaseEnv.h" +#include "DatabaseEnv.h" #include "World.h" #include "Player.h" -#include "Server/Protocol/Opcodes.h" +#include "Opcodes.h" #include "Chat.h" #include "ObjectAccessor.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "AccountMgr.h" #include "SystemConfig.h" #include "revision.h" -#include "Utilities/Util.h" +#include "Util.h" bool ChatHandler::HandleHelpCommand(const char* args) { diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp index 8a739df76d8..d80157611fb 100644 --- a/src/server/game/Chat/Commands/Level1.cpp +++ b/src/server/game/Chat/Commands/Level1.cpp @@ -19,22 +19,22 @@ */ #include "Common.h" -#include "Database/DatabaseEnv.h" -#include "Packets/WorldPacket.h" -#include "Server/WorldSession.h" +#include "DatabaseEnv.h" +#include "WorldPacket.h" +#include "WorldSession.h" #include "World.h" #include "ObjectMgr.h" #include "Player.h" #include "AccountMgr.h" -#include "Server/Protocol/Opcodes.h" +#include "Opcodes.h" #include "Chat.h" -#include "Logging/Log.h" +#include "Log.h" #include "MapManager.h" #include "ObjectAccessor.h" -#include "Miscellaneous/Language.h" -#include "Grids/Cells/CellImpl.h" +#include "Language.h" +#include "CellImpl.h" #include "InstanceSaveMgr.h" -#include "Utilities/Util.h" +#include "Util.h" #ifdef _DEBUG_VMAPS #include "VMapFactory.h" diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp index fbca47ebad0..40772a82922 100644 --- a/src/server/game/Chat/Commands/Level2.cpp +++ b/src/server/game/Chat/Commands/Level2.cpp @@ -19,23 +19,23 @@ */ #include "Common.h" -#include "Database/DatabaseEnv.h" +#include "DatabaseEnv.h" #include "DBCStores.h" #include "ObjectMgr.h" #include "Player.h" #include "Item.h" #include "GameObject.h" -#include "Server/Protocol/Opcodes.h" +#include "Opcodes.h" #include "Chat.h" #include "MapManager.h" -#include "Miscellaneous/Language.h" +#include "Language.h" #include "World.h" #include "GameEventMgr.h" #include "SpellMgr.h" #include "PoolHandler.h" #include "AccountMgr.h" -#include "Movement/Waypoints/WaypointManager.h" -#include "Utilities/Util.h" +#include "WaypointManager.h" +#include "Util.h" #include <cctype> #include <iostream> #include <fstream> diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index 77d07a6f406..abdb99ee5e5 100644 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -19,9 +19,9 @@ */ #include "Common.h" -#include "Database/DatabaseEnv.h" -#include "Packets/WorldPacket.h" -#include "Server/WorldSession.h" +#include "DatabaseEnv.h" +#include "WorldPacket.h" +#include "WorldSession.h" #include "World.h" #include "ObjectMgr.h" #include "AuctionHouseMgr.h" @@ -29,29 +29,29 @@ #include "PlayerDump.h" #include "SpellMgr.h" #include "Player.h" -#include "Server/Protocol/Opcodes.h" +#include "Opcodes.h" #include "GameObject.h" #include "Chat.h" -#include "Logging/Log.h" +#include "Log.h" #include "Guild.h" #include "ObjectAccessor.h" #include "MapManager.h" -#include "Miscellaneous/Language.h" -#include "Grids/Notifiers/GridNotifiersImpl.h" -#include "Grids/Cells/CellImpl.h" +#include "Language.h" +#include "GridNotifiersImpl.h" +#include "CellImpl.h" #include "Weather.h" #include "PointMovementGenerator.h" #include "TargetedMovementGenerator.h" #include "SkillDiscovery.h" #include "SkillExtraItems.h" #include "SystemConfig.h" -#include "Configuration/ConfigEnv.h" -#include "Utilities/Util.h" +#include "ConfigEnv.h" +#include "Util.h" #include "ItemEnchantmentMgr.h" #include "BattleGroundMgr.h" #include "InstanceSaveMgr.h" #include "InstanceData.h" -#include "AuctionHouse/AuctionHouseBot/AuctionHouseBot.h" +#include "AuctionHouseBot.h" #include "CreatureEventAIMgr.h" #include "SpellAuraEffects.h" #include "DBCEnums.h" diff --git a/src/server/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h index ce5947ffc64..0a240ad44be 100644 --- a/src/server/game/Combat/HostileRefManager.h +++ b/src/server/game/Combat/HostileRefManager.h @@ -22,7 +22,7 @@ #define _HOSTILEREFMANAGER #include "Common.h" -#include "Dynamic/LinkedReference/RefManager.h" +#include "RefManager.h" class Unit; class ThreatManager; diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index bdd475f884d..83287ee87be 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -19,13 +19,13 @@ */ -#include "Policies/SingletonImp.h" +#include "SingletonImp.h" #include "Player.h" #include "SpellAuras.h" #include "SpellMgr.h" #include "GameEventMgr.h" #include "ObjectMgr.h" -#include "Utilities/ProgressBar.h" +#include "ProgressBar.h" #include "InstanceData.h" #include "ConditionMgr.h" diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 55eb63ddb1e..510fbdad100 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -19,10 +19,10 @@ */ #include "DBCStores.h" -#include "Policies/SingletonImp.h" +#include "SingletonImp.h" #include "Logging/Log.h" -#include "Utilities/ProgressBar.h" -#include "Miscellaneous/SharedDefines.h" +#include "ProgressBar.h" +#include "SharedDefines.h" #include "SpellMgr.h" #include "DBCfmt.h" diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 480aceb26e6..112aef734e7 100644 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -23,7 +23,7 @@ #include "DBCEnums.h" #include "Define.h" -#include "Utilities/Util.h" +#include "Util.h" #include <map> #include <set> diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 71f27ead4d5..734c5522942 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -15,14 +15,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Policies/SingletonImp.h" +#include "SingletonImp.h" #include "Common.h" -#include "Miscellaneous/SharedDefines.h" +#include "SharedDefines.h" #include "Group.h" #include "Player.h" #include "LFGMgr.h" #include "ObjectMgr.h" -#include "Packets/WorldPacket.h" +#include "WorldPacket.h" INSTANTIATE_SINGLETON_1(LFGMgr); diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index b19da4e3d00..a3d6fedc695 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -20,7 +20,7 @@ #define _LFGMGR_H #include "Common.h" -#include "Policies/Singleton.h" +#include "Singleton.h" #include "Group.h" #include "LFG.h" diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp index 96e5423a085..6d9e11104ab 100644 --- a/src/server/game/Entities/Corpse/Corpse.cpp +++ b/src/server/game/Entities/Corpse/Corpse.cpp @@ -21,10 +21,10 @@ #include "Common.h" #include "Corpse.h" #include "Player.h" -#include "Entities/Object/Updates/UpdateMask.h" +#include "UpdateMask.h" #include "ObjectAccessor.h" -#include "Database/DatabaseEnv.h" -#include "Server/Protocol/Opcodes.h" +#include "DatabaseEnv.h" +#include "Opcodes.h" #include "GossipDef.h" #include "World.h" diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index f7ac131342e..71461f94949 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -19,8 +19,8 @@ */ #include "Common.h" -#include "Database/DatabaseEnv.h" -#include "Packets/WorldPacket.h" +#include "DatabaseEnv.h" +#include "WorldPacket.h" #include "World.h" #include "ObjectMgr.h" #include "SpellMgr.h" @@ -29,27 +29,27 @@ #include "GossipDef.h" #include "Player.h" #include "PoolHandler.h" -#include "Server/Protocol/Opcodes.h" -#include "Logging/Log.h" +#include "Opcodes.h" +#include "Log.h" #include "LootMgr.h" #include "MapManager.h" #include "CreatureAI.h" #include "CreatureAISelector.h" -#include "Miscellaneous/Formulas.h" +#include "Formulas.h" #include "WaypointMovementGenerator.h" #include "InstanceData.h" #include "BattleGroundMgr.h" -#include "Utilities/Util.h" -#include "Grids/Notifiers/GridNotifiers.h" -#include "Grids/Notifiers/GridNotifiersImpl.h" -#include "Grids/Cells/CellImpl.h" +#include "Util.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "CellImpl.h" #include "OutdoorPvPMgr.h" #include "GameEventMgr.h" #include "CreatureGroups.h" #include "Vehicle.h" #include "SpellAuraEffects.h" // apply implementation of the singletons -#include "Policies/SingletonImp.h" +#include "SingletonImp.h" TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const { diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 03cb8da00bf..25aab942916 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -21,8 +21,8 @@ #include "Creature.h" #include "CreatureGroups.h" #include "ObjectMgr.h" -#include "Utilities/ProgressBar.h" -#include "Policies/SingletonImp.h" +#include "ProgressBar.h" +#include "SingletonImp.h" #include "CreatureAI.h" #define MAX_DESYNC 5.0f diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index e2cd8965373..3e0fec52bc7 100644 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -21,10 +21,10 @@ #include "QuestDef.h" #include "GossipDef.h" #include "ObjectMgr.h" -#include "Server/Protocol/Opcodes.h" -#include "Packets/WorldPacket.h" -#include "Server/WorldSession.h" -#include "Miscellaneous/Formulas.h" +#include "Opcodes.h" +#include "WorldPacket.h" +#include "WorldSession.h" +#include "Formulas.h" GossipMenu::GossipMenu() { diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 860bdf21803..11652460fc5 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "Logging/Log.h" +#include "Log.h" #include "ObjectAccessor.h" #include "CreatureAI.h" #include "ObjectMgr.h" diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp index 49f82f19b80..5c13fe47cb7 100644 --- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp +++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp @@ -19,14 +19,14 @@ */ #include "Common.h" -#include "Entities/Object/Updates/UpdateMask.h" -#include "Server/Protocol/Opcodes.h" +#include "UpdateMask.h" +#include "Opcodes.h" #include "World.h" #include "ObjectAccessor.h" -#include "Database/DatabaseEnv.h" -#include "Grids/Notifiers/GridNotifiers.h" -#include "Grids/Cells/CellImpl.h" -#include "Grids/Notifiers/GridNotifiersImpl.h" +#include "DatabaseEnv.h" +#include "GridNotifiers.h" +#include "CellImpl.h" +#include "GridNotifiersImpl.h" DynamicObject::DynamicObject() : WorldObject() { diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 9bc1e2ff5e2..364bc8ec29c 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -25,20 +25,20 @@ #include "PoolHandler.h" #include "SpellMgr.h" #include "Spell.h" -#include "Entities/Object/Updates/UpdateMask.h" -#include "Server/Protocol/Opcodes.h" -#include "Packets/WorldPacket.h" +#include "UpdateMask.h" +#include "Opcodes.h" +#include "WorldPacket.h" #include "World.h" -#include "Database/DatabaseEnv.h" +#include "DatabaseEnv.h" #include "LootMgr.h" -#include "Grids/Notifiers/GridNotifiers.h" -#include "Grids/Notifiers/GridNotifiersImpl.h" -#include "Grids/Cells/CellImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "CellImpl.h" #include "InstanceData.h" #include "BattleGround.h" -#include "Utilities/Util.h" +#include "Util.h" #include "OutdoorPvPMgr.h" -#include "BattleGrounds/Zones/BattleGroundAV.h" +#include "BattleGroundAV.h" #include "ScriptMgr.h" GameObject::GameObject() : WorldObject(), m_goValue(new GameObjectValue) |