diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-12-31 18:12:36 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2025-01-01 20:59:52 +0100 |
| commit | 435864761e1de4be4bc8a344dec8e787ddbe636b (patch) | |
| tree | 93c747b367f81efca05b90ff637051616a5b6408 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | af13de7f211903586da97ee21e2c9be52ac2b58c (diff) | |
Core/Misc: Include cleanup - remove MapUtils.h from Containers.h
(cherry picked from commit d778d5ec7cfa94d6de2500e1fff7ae3bd30be18f)
# Conflicts:
# src/server/game/Achievements/CriteriaHandler.cpp
# src/server/game/Globals/ObjectMgr.cpp
# src/server/scripts/BrokenIsles/zone_mardum.cpp
# src/server/scripts/ExilesReach/zone_exiles_reach.cpp
# src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 5b2066d22a1..e8731b04eb5 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -16,33 +16,33 @@ */ #include "ObjectMgr.h" -#include "ArenaTeamMgr.h" #include "AreaTriggerDataStore.h" #include "AreaTriggerTemplate.h" #include "Chat.h" #include "Containers.h" #include "CreatureAIFactory.h" #include "CriteriaHandler.h" -#include "DatabaseEnv.h" #include "DB2Stores.h" +#include "DatabaseEnv.h" #include "DisableMgr.h" #include "GameObject.h" #include "GameObjectAIFactory.h" #include "GameTables.h" #include "GameTime.h" -#include "GridDefines.h" #include "GossipDef.h" +#include "GridDefines.h" #include "GroupMgr.h" #include "GuildMgr.h" #include "InstanceScript.h" #include "Item.h" #include "ItemBonusMgr.h" -#include "Language.h" #include "LFGMgr.h" +#include "Language.h" #include "Log.h" #include "LootMgr.h" #include "Mail.h" #include "MapManager.h" +#include "MapUtils.h" #include "MotionMaster.h" #include "MovementTypedefs.h" #include "ObjectAccessor.h" @@ -65,13 +65,13 @@ #include "ThreadPool.h" #include "Timer.h" #include "TransportMgr.h" -#include "Vehicle.h" #include "VMapFactory.h" #include "VMapManager2.h" +#include "Vehicle.h" #include "World.h" #include <G3D/g3dmath.h> -#include <numeric> #include <limits> +#include <numeric> ScriptMapMap sSpellScripts; ScriptMapMap sEventScripts; |