From d778d5ec7cfa94d6de2500e1fff7ae3bd30be18f Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 31 Dec 2024 18:12:36 +0100 Subject: Core/Misc: Include cleanup - remove MapUtils.h from Containers.h --- src/server/game/Entities/AreaTrigger/AreaTrigger.cpp | 1 + src/server/game/Entities/Conversation/Conversation.cpp | 3 +-- src/server/game/Entities/Creature/Creature.cpp | 3 ++- src/server/game/Entities/Creature/CreatureGroups.cpp | 2 +- src/server/game/Entities/GameObject/GameObject.cpp | 5 +++-- src/server/game/Entities/Item/Item.cpp | 4 ++-- src/server/game/Entities/Object/SmoothPhasing.cpp | 2 +- src/server/game/Entities/Player/Player.cpp | 1 + 8 files changed, 12 insertions(+), 9 deletions(-) (limited to 'src/server/game/Entities') diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp index dd8b8f0b54d..b12692fe4e1 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp +++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp @@ -27,6 +27,7 @@ #include "GridNotifiersImpl.h" #include "Language.h" #include "Log.h" +#include "MapUtils.h" #include "Object.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" diff --git a/src/server/game/Entities/Conversation/Conversation.cpp b/src/server/game/Entities/Conversation/Conversation.cpp index 746f936a88c..0ca5ab2d435 100644 --- a/src/server/game/Entities/Conversation/Conversation.cpp +++ b/src/server/game/Entities/Conversation/Conversation.cpp @@ -17,7 +17,6 @@ #include "Conversation.h" #include "ConditionMgr.h" -#include "Containers.h" #include "ConversationAI.h" #include "ConversationDataStore.h" #include "Creature.h" @@ -26,10 +25,10 @@ #include "IteratorPair.h" #include "Log.h" #include "Map.h" +#include "MapUtils.h" #include "ObjectAccessor.h" #include "PhasingHandler.h" #include "Player.h" -#include "ScriptMgr.h" #include "UpdateData.h" #include "WorldSession.h" diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 466ddec3800..22e60cf7490 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -24,8 +24,8 @@ #include "CreatureAI.h" #include "CreatureAISelector.h" #include "CreatureGroups.h" -#include "DatabaseEnv.h" #include "DB2Stores.h" +#include "DatabaseEnv.h" #include "Formulas.h" #include "GameEventMgr.h" #include "GameTime.h" @@ -36,6 +36,7 @@ #include "Loot.h" #include "LootMgr.h" #include "MapManager.h" +#include "MapUtils.h" #include "MiscPackets.h" #include "MotionMaster.h" #include "ObjectAccessor.h" diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 179e3c5179f..da6c4ba208a 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -16,12 +16,12 @@ */ #include "CreatureGroups.h" -#include "Containers.h" #include "Creature.h" #include "CreatureAI.h" #include "DatabaseEnv.h" #include "Log.h" #include "Map.h" +#include "MapUtils.h" #include "MotionMaster.h" #include "MovementGenerator.h" #include "ObjectMgr.h" diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index c3a9610ad2b..8967fab4de8 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -24,8 +24,8 @@ #include "CellImpl.h" #include "Containers.h" #include "CreatureAISelector.h" -#include "DatabaseEnv.h" #include "DB2Stores.h" +#include "DatabaseEnv.h" #include "G3DPosition.hpp" #include "GameEventSender.h" #include "GameObjectAI.h" @@ -42,6 +42,7 @@ #include "LootMgr.h" #include "Map.h" #include "MapManager.h" +#include "MapUtils.h" #include "MiscPackets.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" @@ -49,10 +50,10 @@ #include "PhasingHandler.h" #include "PoolMgr.h" #include "QueryPackets.h" -#include "Util.h" #include "SpellAuras.h" #include "SpellMgr.h" #include "Transport.h" +#include "Util.h" #include "Vignette.h" #include "World.h" #include diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 498d2a0b3ee..e8d7cc2582e 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -23,9 +23,8 @@ #include "CollectionMgr.h" #include "Common.h" #include "ConditionMgr.h" -#include "Containers.h" -#include "DatabaseEnv.h" #include "DB2Stores.h" +#include "DatabaseEnv.h" #include "GameTables.h" #include "GameTime.h" #include "ItemBonusMgr.h" @@ -36,6 +35,7 @@ #include "LootItemStorage.h" #include "LootMgr.h" #include "Map.h" +#include "MapUtils.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" diff --git a/src/server/game/Entities/Object/SmoothPhasing.cpp b/src/server/game/Entities/Object/SmoothPhasing.cpp index d578df24f2b..4b5377eb043 100644 --- a/src/server/game/Entities/Object/SmoothPhasing.cpp +++ b/src/server/game/Entities/Object/SmoothPhasing.cpp @@ -16,7 +16,7 @@ */ #include "SmoothPhasing.h" -#include "Containers.h" +#include "MapUtils.h" void SmoothPhasing::SetViewerDependentInfo(ObjectGuid seer, SmoothPhasingInfo const& info) { diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6b2ca21827c..4b93b37ec4c 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -87,6 +87,7 @@ #include "Mail.h" #include "MailPackets.h" #include "MapManager.h" +#include "MapUtils.h" #include "MiscPackets.h" #include "MotionMaster.h" #include "MovementPackets.h" -- cgit v1.2.3