From 1ba2d1ac9d387410d6deac15408a3aba59ac6180 Mon Sep 17 00:00:00 2001 From: Antz Date: Fri, 20 Jan 2017 23:20:40 +0000 Subject: [PATCH] Remove unused include directives Based on the work of @stfx in commit: https://github.com/cmangos/mangos-classic/commit/48a84fb --- src/game/AuctionHouseBot/AuctionHouseBot.cpp | 1 + src/game/AuctionHouseBot/AuctionHouseBot.h | 1 - src/game/BattleGround/BattleGround.cpp | 1 - src/game/BattleGround/BattleGroundAB.cpp | 3 --- src/game/BattleGround/BattleGroundWS.cpp | 2 -- src/game/ChatCommands/Level2.cpp | 11 +++++------ src/game/ChatCommands/Level3.cpp | 2 -- src/game/ChatCommands/debugcmds.cpp | 2 +- .../MotionGenerators/ConfusedMovementGenerator.cpp | 2 -- .../MotionGenerators/FleeingMovementGenerator.cpp | 1 - src/game/MotionGenerators/HomeMovementGenerator.cpp | 2 -- src/game/MotionGenerators/MotionMaster.cpp | 1 + src/game/MotionGenerators/MovementGenerator.h | 3 --- .../MotionGenerators/PointMovementGenerator.cpp | 1 - .../MotionGenerators/RandomMovementGenerator.cpp | 1 - .../MotionGenerators/TargetedMovementGenerator.cpp | 2 -- .../MotionGenerators/WaypointMovementGenerator.cpp | 3 --- .../MotionGenerators/WaypointMovementGenerator.h | 1 - src/game/Object/AggressorAI.cpp | 11 +++-------- src/game/Object/AuctionHouseMgr.h | 2 -- src/game/Object/Bag.cpp | 1 - src/game/Object/Corpse.cpp | 3 --- src/game/Object/Creature.cpp | 3 --- src/game/Object/Creature.h | 3 --- src/game/Object/CreatureAI.h | 3 --- src/game/Object/CreatureAISelector.cpp | 1 + src/game/Object/CreatureEventAI.cpp | 2 -- src/game/Object/CreatureEventAIMgr.cpp | 1 - src/game/Object/DynamicObject.cpp | 3 --- src/game/Object/GameObject.cpp | 1 - src/game/Object/GameObject.h | 1 - src/game/Object/GuardAI.cpp | 1 - src/game/Object/ItemEnchantmentMgr.cpp | 5 ++--- src/game/Object/LootMgr.cpp | 1 + src/game/Object/LootMgr.h | 2 -- src/game/Object/Object.cpp | 5 ----- src/game/Object/Object.h | 1 - src/game/Object/ObjectAccessor.cpp | 7 ------- src/game/Object/ObjectAccessor.h | 5 ----- src/game/Object/ObjectGuid.h | 2 -- src/game/Object/ObjectMgr.cpp | 5 +---- src/game/Object/ObjectMgr.h | 3 --- src/game/Object/Pet.cpp | 2 -- src/game/Object/PetAI.cpp | 1 - src/game/Object/Player.cpp | 1 - src/game/Object/Player.h | 2 -- src/game/Object/ReactorAI.cpp | 2 -- src/game/Object/SocialMgr.h | 1 - src/game/Object/SpellMgr.cpp | 4 +--- src/game/Object/Totem.cpp | 1 - src/game/Object/TotemAI.cpp | 1 - src/game/Object/TotemAI.h | 1 - src/game/Object/Unit.cpp | 5 ----- src/game/Object/Unit.h | 3 ++- src/game/Object/UpdateMask.h | 1 - src/game/OutdoorPvP/OutdoorPvP.cpp | 2 -- src/game/OutdoorPvP/OutdoorPvPMgr.h | 1 - src/game/OutdoorPvP/OutdoorPvPSI.cpp | 1 + src/game/OutdoorPvP/OutdoorPvPSI.h | 1 - src/game/References/GroupReference.cpp | 1 - src/game/Server/DBCStores.cpp | 2 -- src/game/Server/DBCStructure.h | 1 - src/game/Server/SQLStorages.h | 1 - src/game/Server/SharedDefines.h | 1 - src/game/Server/WorldSession.cpp | 1 - src/game/Tools/PlayerDump.h | 2 -- src/game/WorldHandlers/AccountMgr.h | 2 -- src/game/WorldHandlers/AuctionHouseHandler.cpp | 1 - src/game/WorldHandlers/Cell.h | 2 -- src/game/WorldHandlers/Channel.h | 3 --- src/game/WorldHandlers/ChannelMgr.h | 2 -- src/game/WorldHandlers/Chat.cpp | 1 - src/game/WorldHandlers/ChatHandler.cpp | 1 - src/game/WorldHandlers/CombatHandler.cpp | 1 - src/game/WorldHandlers/DuelHandler.cpp | 2 -- src/game/WorldHandlers/GameEventMgr.cpp | 1 - src/game/WorldHandlers/GameEventMgr.h | 1 - src/game/WorldHandlers/GridMap.cpp | 2 -- src/game/WorldHandlers/GridMap.h | 3 --- src/game/WorldHandlers/GridNotifiers.cpp | 1 - src/game/WorldHandlers/GridNotifiers.h | 2 -- src/game/WorldHandlers/GridNotifiersImpl.h | 2 -- src/game/WorldHandlers/GridStates.cpp | 3 +-- src/game/WorldHandlers/Group.cpp | 2 -- src/game/WorldHandlers/Group.h | 5 ----- src/game/WorldHandlers/GuildHandler.cpp | 1 - src/game/WorldHandlers/GuildMgr.h | 1 - src/game/WorldHandlers/LootHandler.cpp | 6 +----- src/game/WorldHandlers/Map.cpp | 6 ++++-- src/game/WorldHandlers/Map.h | 3 --- src/game/WorldHandlers/MapManager.cpp | 1 - src/game/WorldHandlers/MapPersistentStateMgr.cpp | 3 --- src/game/WorldHandlers/MassMailMgr.h | 3 --- src/game/WorldHandlers/MiscHandler.cpp | 2 -- src/game/WorldHandlers/MoveMap.cpp | 2 -- src/game/WorldHandlers/MovementHandler.cpp | 1 - src/game/WorldHandlers/NPCHandler.cpp | 1 - src/game/WorldHandlers/ObjectGridLoader.cpp | 1 - src/game/WorldHandlers/ObjectGridLoader.h | 1 - src/game/WorldHandlers/PoolManager.cpp | 1 - src/game/WorldHandlers/PoolManager.h | 1 - src/game/WorldHandlers/QueryHandler.cpp | 3 --- src/game/WorldHandlers/QuestDef.h | 1 - src/game/WorldHandlers/ScriptMgr.cpp | 1 - src/game/WorldHandlers/ScriptMgr.h | 1 - src/game/WorldHandlers/SkillHandler.cpp | 3 --- src/game/WorldHandlers/Spell.cpp | 2 -- src/game/WorldHandlers/SpellAuras.cpp | 2 -- src/game/WorldHandlers/SpellEffects.cpp | 5 ----- src/game/WorldHandlers/TaxiHandler.cpp | 1 - src/game/WorldHandlers/TradeHandler.cpp | 2 +- src/game/WorldHandlers/Transports.h | 1 - src/game/WorldHandlers/UnitAuraProcHandler.cpp | 3 +-- src/game/WorldHandlers/WaypointManager.h | 3 --- src/game/WorldHandlers/World.cpp | 1 - src/game/WorldHandlers/World.h | 1 - src/game/movement/MoveSplineFlag.h | 2 -- src/game/movement/util.cpp | 1 - src/game/vmap/BIH.h | 13 ++++++------- src/game/vmap/GameObjectModel.cpp | 1 - src/game/vmap/IVMapManager.h | 2 +- src/game/vmap/RegularGrid.h | 1 - src/game/vmap/TileAssembler.cpp | 8 ++++---- src/game/vmap/VMapDefinitions.h | 2 -- src/game/vmap/VMapFactory.cpp | 1 - src/game/vmap/VMapManager2.cpp | 1 - src/game/vmap/WorldModel.h | 3 ++- 127 files changed, 41 insertions(+), 246 deletions(-) diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp index 08bd888e7..f2b0d629f 100644 --- a/src/game/AuctionHouseBot/AuctionHouseBot.cpp +++ b/src/game/AuctionHouseBot/AuctionHouseBot.cpp @@ -29,6 +29,7 @@ #include "AuctionHouseMgr.h" #include "SystemConfig.h" #include "SQLStorages.h" +#include "World.h" /** \addtogroup auctionbot * @{ diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.h b/src/game/AuctionHouseBot/AuctionHouseBot.h index ea8fe3b36..f9bc2c40f 100644 --- a/src/game/AuctionHouseBot/AuctionHouseBot.h +++ b/src/game/AuctionHouseBot/AuctionHouseBot.h @@ -25,7 +25,6 @@ #ifndef AUCTION_HOUSE_BOT_H #define AUCTION_HOUSE_BOT_H -#include "World.h" #include "Config/Config.h" #include "AuctionHouseMgr.h" #include "SharedDefines.h" diff --git a/src/game/BattleGround/BattleGround.cpp b/src/game/BattleGround/BattleGround.cpp index d5ec46f1e..baf93ff16 100644 --- a/src/game/BattleGround/BattleGround.cpp +++ b/src/game/BattleGround/BattleGround.cpp @@ -37,7 +37,6 @@ #include "ObjectMgr.h" #include "Mail.h" #include "WorldPacket.h" -#include "Util.h" #include "Formulas.h" #include "GridNotifiersImpl.h" #include "Chat.h" diff --git a/src/game/BattleGround/BattleGroundAB.cpp b/src/game/BattleGround/BattleGroundAB.cpp index e83336bdb..86e81ed4a 100644 --- a/src/game/BattleGround/BattleGroundAB.cpp +++ b/src/game/BattleGround/BattleGroundAB.cpp @@ -26,13 +26,10 @@ #include "Player.h" #include "BattleGround.h" #include "BattleGroundAB.h" -#include "Creature.h" #include "GameObject.h" #include "BattleGroundMgr.h" #include "Language.h" -#include "Util.h" #include "WorldPacket.h" -#include "MapManager.h" #include "DBCStores.h" // TODO REMOVE this when graveyard handling for pvp is updated /// diff --git a/src/game/BattleGround/BattleGroundWS.cpp b/src/game/BattleGround/BattleGroundWS.cpp index 6b21f00f7..09517d92d 100644 --- a/src/game/BattleGround/BattleGroundWS.cpp +++ b/src/game/BattleGround/BattleGroundWS.cpp @@ -26,13 +26,11 @@ #include "Player.h" #include "BattleGround.h" #include "BattleGroundWS.h" -#include "Creature.h" #include "GameObject.h" #include "ObjectMgr.h" #include "BattleGroundMgr.h" #include "WorldPacket.h" #include "Language.h" -#include "MapManager.h" BattleGroundWS::BattleGroundWS(): m_ReputationCapture(0), m_HonorWinKills(0), m_HonorEndKills(0), m_EndTimer(0), m_LastCapturedFlagTeam() { diff --git a/src/game/ChatCommands/Level2.cpp b/src/game/ChatCommands/Level2.cpp index c7d2ec47c..bd3b0ddbb 100644 --- a/src/game/ChatCommands/Level2.cpp +++ b/src/game/ChatCommands/Level2.cpp @@ -40,7 +40,6 @@ #include "Language.h" #include "World.h" #include "GameEventMgr.h" -#include "ScriptMgr.h" #include "SpellMgr.h" #include "MapPersistentStateMgr.h" #include "AccountMgr.h" @@ -52,17 +51,17 @@ #include "GridNotifiersImpl.h" #include "CellImpl.h" #include "WaypointMovementGenerator.h" -#include -#include -#include -#include -#include +#include "Formulas.h" #include "TargetedMovementGenerator.h" // for HandleNpcUnFollowCommand #include "MoveMap.h" // for mmap manager #include "PathFinder.h" // for mmap commands #include "movement/MoveSplineInit.h" +#include +#include +#include + static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] = { LANG_REP_HATED, LANG_REP_HOSTILE, LANG_REP_UNFRIENDLY, LANG_REP_NEUTRAL, diff --git a/src/game/ChatCommands/Level3.cpp b/src/game/ChatCommands/Level3.cpp index ee20328ff..44070cf1a 100644 --- a/src/game/ChatCommands/Level3.cpp +++ b/src/game/ChatCommands/Level3.cpp @@ -24,7 +24,6 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "WorldPacket.h" #include "WorldSession.h" #include "World.h" #include "ObjectMgr.h" @@ -32,7 +31,6 @@ #include "PlayerDump.h" #include "SpellMgr.h" #include "Player.h" -#include "Opcodes.h" #include "GameObject.h" #include "Chat.h" #include "Log.h" diff --git a/src/game/ChatCommands/debugcmds.cpp b/src/game/ChatCommands/debugcmds.cpp index 54897c1ab..f26af75da 100644 --- a/src/game/ChatCommands/debugcmds.cpp +++ b/src/game/ChatCommands/debugcmds.cpp @@ -23,7 +23,7 @@ */ #include "Common.h" -#include "Database/DatabaseEnv.h" +#include "DBCStores.h" #include "WorldPacket.h" #include "Player.h" #include "Opcodes.h" diff --git a/src/game/MotionGenerators/ConfusedMovementGenerator.cpp b/src/game/MotionGenerators/ConfusedMovementGenerator.cpp index 5d8f24d66..8c575a340 100644 --- a/src/game/MotionGenerators/ConfusedMovementGenerator.cpp +++ b/src/game/MotionGenerators/ConfusedMovementGenerator.cpp @@ -23,12 +23,10 @@ */ #include "ConfusedMovementGenerator.h" -#include "MapManager.h" #include "Creature.h" #include "Player.h" #include "movement/MoveSplineInit.h" #include "movement/MoveSpline.h" -#include "PathFinder.h" template void ConfusedMovementGenerator::Initialize(T& unit) diff --git a/src/game/MotionGenerators/FleeingMovementGenerator.cpp b/src/game/MotionGenerators/FleeingMovementGenerator.cpp index fb2a14869..de5155b9c 100644 --- a/src/game/MotionGenerators/FleeingMovementGenerator.cpp +++ b/src/game/MotionGenerators/FleeingMovementGenerator.cpp @@ -24,7 +24,6 @@ #include "Creature.h" #include "CreatureAI.h" -#include "MapManager.h" #include "FleeingMovementGenerator.h" #include "ObjectAccessor.h" #include "movement/MoveSplineInit.h" diff --git a/src/game/MotionGenerators/HomeMovementGenerator.cpp b/src/game/MotionGenerators/HomeMovementGenerator.cpp index 02bb32cfd..cfef844d8 100644 --- a/src/game/MotionGenerators/HomeMovementGenerator.cpp +++ b/src/game/MotionGenerators/HomeMovementGenerator.cpp @@ -25,8 +25,6 @@ #include "HomeMovementGenerator.h" #include "Creature.h" #include "CreatureAI.h" -#include "ObjectMgr.h" -#include "WorldPacket.h" #include "movement/MoveSplineInit.h" #include "movement/MoveSpline.h" diff --git a/src/game/MotionGenerators/MotionMaster.cpp b/src/game/MotionGenerators/MotionMaster.cpp index 19c230a4d..514da01e5 100644 --- a/src/game/MotionGenerators/MotionMaster.cpp +++ b/src/game/MotionGenerators/MotionMaster.cpp @@ -39,6 +39,7 @@ #include "CreatureLinkingMgr.h" #include "Pet.h" #include "DBCStores.h" +#include "Log.h" #include diff --git a/src/game/MotionGenerators/MovementGenerator.h b/src/game/MotionGenerators/MovementGenerator.h index a3680c3e6..b5c8853c2 100644 --- a/src/game/MotionGenerators/MovementGenerator.h +++ b/src/game/MotionGenerators/MovementGenerator.h @@ -25,10 +25,7 @@ #ifndef MANGOS_MOVEMENTGENERATOR_H #define MANGOS_MOVEMENTGENERATOR_H -#include "Common.h" #include "Platform/Define.h" -#include "Policies/Singleton.h" -#include "Dynamic/ObjectRegistry.h" #include "Dynamic/FactoryHolder.h" #include "MotionMaster.h" #include "Timer.h" diff --git a/src/game/MotionGenerators/PointMovementGenerator.cpp b/src/game/MotionGenerators/PointMovementGenerator.cpp index 04b5b3e45..0144e0758 100644 --- a/src/game/MotionGenerators/PointMovementGenerator.cpp +++ b/src/game/MotionGenerators/PointMovementGenerator.cpp @@ -23,7 +23,6 @@ */ #include "PointMovementGenerator.h" -#include "Errors.h" #include "Creature.h" #include "CreatureAI.h" #include "TemporarySummon.h" diff --git a/src/game/MotionGenerators/RandomMovementGenerator.cpp b/src/game/MotionGenerators/RandomMovementGenerator.cpp index 122275e95..f3073a744 100644 --- a/src/game/MotionGenerators/RandomMovementGenerator.cpp +++ b/src/game/MotionGenerators/RandomMovementGenerator.cpp @@ -23,7 +23,6 @@ */ #include "Creature.h" -#include "MapManager.h" #include "RandomMovementGenerator.h" #include "Map.h" #include "Util.h" diff --git a/src/game/MotionGenerators/TargetedMovementGenerator.cpp b/src/game/MotionGenerators/TargetedMovementGenerator.cpp index b94efd590..a94d4654c 100644 --- a/src/game/MotionGenerators/TargetedMovementGenerator.cpp +++ b/src/game/MotionGenerators/TargetedMovementGenerator.cpp @@ -23,8 +23,6 @@ */ #include "TargetedMovementGenerator.h" -#include "ByteBuffer.h" -#include "Errors.h" #include "PathFinder.h" #include "Unit.h" #include "Creature.h" diff --git a/src/game/MotionGenerators/WaypointMovementGenerator.cpp b/src/game/MotionGenerators/WaypointMovementGenerator.cpp index 7e0c86984..beec77b56 100644 --- a/src/game/MotionGenerators/WaypointMovementGenerator.cpp +++ b/src/game/MotionGenerators/WaypointMovementGenerator.cpp @@ -22,15 +22,12 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ -#include - #include "WaypointMovementGenerator.h" #include "ObjectMgr.h" #include "Player.h" #include "Creature.h" #include "CreatureAI.h" #include "WaypointManager.h" -#include "WorldPacket.h" #include "ScriptMgr.h" #include "movement/MoveSplineInit.h" #include "movement/MoveSpline.h" diff --git a/src/game/MotionGenerators/WaypointMovementGenerator.h b/src/game/MotionGenerators/WaypointMovementGenerator.h index 64a23b0b6..dcf495155 100644 --- a/src/game/MotionGenerators/WaypointMovementGenerator.h +++ b/src/game/MotionGenerators/WaypointMovementGenerator.h @@ -35,7 +35,6 @@ #include "WaypointManager.h" #include "DBCStructure.h" -#include #include #define FLIGHT_TRAVEL_UPDATE 100 diff --git a/src/game/Object/AggressorAI.cpp b/src/game/Object/AggressorAI.cpp index 5047ae279..949cfe4ef 100644 --- a/src/game/Object/AggressorAI.cpp +++ b/src/game/Object/AggressorAI.cpp @@ -25,16 +25,12 @@ #include "AggressorAI.h" #include "Errors.h" #include "Creature.h" -#include "SharedDefines.h" -#include "VMapFactory.h" #include "World.h" #include "DBCStores.h" #include "Map.h" +#include "Log.h" -#include - -int -AggressorAI::Permissible(const Creature* creature) +int AggressorAI::Permissible(const Creature* creature) { // have some hostile factions, it will be selected by IsHostileTo check at MoveInLineOfSight if (!creature->IsCivilian() && !creature->IsNeutralToAll()) @@ -47,8 +43,7 @@ AggressorAI::AggressorAI(Creature* c) : CreatureAI(c), i_state(STATE_NORMAL), i_ { } -void -AggressorAI::MoveInLineOfSight(Unit* u) +void AggressorAI::MoveInLineOfSight(Unit* u) { // Ignore Z for flying creatures if (!m_creature->CanFly() && m_creature->GetDistanceZ(u) > CREATURE_Z_ATTACK_RANGE) diff --git a/src/game/Object/AuctionHouseMgr.h b/src/game/Object/AuctionHouseMgr.h index ccbc2a226..1b9b53fd9 100644 --- a/src/game/Object/AuctionHouseMgr.h +++ b/src/game/Object/AuctionHouseMgr.h @@ -26,8 +26,6 @@ #define _AUCTION_HOUSE_MGR_H #include "Common.h" -#include "SharedDefines.h" -#include "Policies/Singleton.h" #include "DBCStructure.h" class Item; diff --git a/src/game/Object/Bag.cpp b/src/game/Object/Bag.cpp index 36c81d6bc..d542cfe47 100644 --- a/src/game/Object/Bag.cpp +++ b/src/game/Object/Bag.cpp @@ -25,7 +25,6 @@ #include "Bag.h" #include "ObjectMgr.h" #include "Database/DatabaseEnv.h" -#include "Log.h" #include "UpdateData.h" Bag::Bag(): Item() diff --git a/src/game/Object/Corpse.cpp b/src/game/Object/Corpse.cpp index 4395367b3..46c4aacb5 100644 --- a/src/game/Object/Corpse.cpp +++ b/src/game/Object/Corpse.cpp @@ -24,12 +24,9 @@ #include "Corpse.h" #include "Player.h" -#include "UpdateMask.h" #include "ObjectAccessor.h" #include "ObjectGuid.h" #include "Database/DatabaseEnv.h" -#include "Opcodes.h" -#include "GossipDef.h" #include "World.h" #include "ObjectMgr.h" diff --git a/src/game/Object/Creature.cpp b/src/game/Object/Creature.cpp index c711e57e0..e774769f2 100644 --- a/src/game/Object/Creature.cpp +++ b/src/game/Object/Creature.cpp @@ -31,7 +31,6 @@ #include "ObjectGuid.h" #include "SQLStorages.h" #include "SpellMgr.h" -#include "QuestDef.h" #include "GossipDef.h" #include "Player.h" #include "GameEventMgr.h" @@ -42,8 +41,6 @@ #include "MapManager.h" #include "CreatureAI.h" #include "CreatureAISelector.h" -#include "Formulas.h" -#include "WaypointMovementGenerator.h" #include "InstanceData.h" #include "MapPersistentStateMgr.h" #include "BattleGround/BattleGroundMgr.h" diff --git a/src/game/Object/Creature.h b/src/game/Object/Creature.h index 978caceb5..ad82ca806 100644 --- a/src/game/Object/Creature.h +++ b/src/game/Object/Creature.h @@ -27,12 +27,9 @@ #include "Common.h" #include "Unit.h" -#include "UpdateMask.h" -#include "ItemPrototype.h" #include "SharedDefines.h" #include "LootMgr.h" #include "DBCEnums.h" -#include "Database/DatabaseEnv.h" #include "Cell.h" #include diff --git a/src/game/Object/CreatureAI.h b/src/game/Object/CreatureAI.h index 4ce1dda18..d89d2ca75 100644 --- a/src/game/Object/CreatureAI.h +++ b/src/game/Object/CreatureAI.h @@ -25,10 +25,7 @@ #ifndef MANGOS_CREATUREAI_H #define MANGOS_CREATUREAI_H -#include "Common.h" #include "Platform/Define.h" -#include "Policies/Singleton.h" -#include "Dynamic/ObjectRegistry.h" #include "Dynamic/FactoryHolder.h" #include "ObjectGuid.h" diff --git a/src/game/Object/CreatureAISelector.cpp b/src/game/Object/CreatureAISelector.cpp index acc755679..db5e7f7b1 100644 --- a/src/game/Object/CreatureAISelector.cpp +++ b/src/game/Object/CreatureAISelector.cpp @@ -30,6 +30,7 @@ #include "MovementGenerator.h" #include "ScriptMgr.h" #include "Pet.h" +#include "Log.h" INSTANTIATE_SINGLETON_1(CreatureAIRegistry); INSTANTIATE_SINGLETON_1(MovementGeneratorRegistry); diff --git a/src/game/Object/CreatureEventAI.cpp b/src/game/Object/CreatureEventAI.cpp index be40b98ce..e93843631 100644 --- a/src/game/Object/CreatureEventAI.cpp +++ b/src/game/Object/CreatureEventAI.cpp @@ -26,11 +26,9 @@ #include "CreatureEventAI.h" #include "CreatureEventAIMgr.h" #include "ObjectMgr.h" -#include "Spell.h" #include "World.h" #include "Cell.h" #include "CellImpl.h" -#include "GameEventMgr.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "InstanceData.h" diff --git a/src/game/Object/CreatureEventAIMgr.cpp b/src/game/Object/CreatureEventAIMgr.cpp index 9897751eb..d6333612d 100644 --- a/src/game/Object/CreatureEventAIMgr.cpp +++ b/src/game/Object/CreatureEventAIMgr.cpp @@ -30,7 +30,6 @@ #include "ObjectMgr.h" #include "ProgressBar.h" #include "Policies/Singleton.h" -#include "ObjectGuid.h" #include "GridDefines.h" #include "SpellMgr.h" #include "World.h" diff --git a/src/game/Object/DynamicObject.cpp b/src/game/Object/DynamicObject.cpp index 6b84bcde9..5b2c0c689 100644 --- a/src/game/Object/DynamicObject.cpp +++ b/src/game/Object/DynamicObject.cpp @@ -23,11 +23,8 @@ */ #include "Common.h" -#include "UpdateMask.h" -#include "Opcodes.h" #include "World.h" #include "ObjectAccessor.h" -#include "Database/DatabaseEnv.h" #include "GridNotifiers.h" #include "CellImpl.h" #include "GridNotifiersImpl.h" diff --git a/src/game/Object/GameObject.cpp b/src/game/Object/GameObject.cpp index 6cc49f291..b93b8402b 100644 --- a/src/game/Object/GameObject.cpp +++ b/src/game/Object/GameObject.cpp @@ -28,7 +28,6 @@ #include "PoolManager.h" #include "SpellMgr.h" #include "Spell.h" -#include "UpdateMask.h" #include "Opcodes.h" #include "WorldPacket.h" #include "World.h" diff --git a/src/game/Object/GameObject.h b/src/game/Object/GameObject.h index e76f45ed8..b9a11a8cd 100644 --- a/src/game/Object/GameObject.h +++ b/src/game/Object/GameObject.h @@ -29,7 +29,6 @@ #include "SharedDefines.h" #include "Object.h" #include "LootMgr.h" -#include "Database/DatabaseEnv.h" #include "Utilities/EventProcessor.h" // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform diff --git a/src/game/Object/GuardAI.cpp b/src/game/Object/GuardAI.cpp index 818fac578..85acc0cb8 100644 --- a/src/game/Object/GuardAI.cpp +++ b/src/game/Object/GuardAI.cpp @@ -23,7 +23,6 @@ */ #include "GuardAI.h" -#include "Errors.h" #include "Creature.h" #include "Player.h" #include "World.h" diff --git a/src/game/Object/ItemEnchantmentMgr.cpp b/src/game/Object/ItemEnchantmentMgr.cpp index 2dd36269c..c54e486d8 100644 --- a/src/game/Object/ItemEnchantmentMgr.cpp +++ b/src/game/Object/ItemEnchantmentMgr.cpp @@ -22,16 +22,15 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ -#include -#include #include "ItemEnchantmentMgr.h" #include "Database/DatabaseEnv.h" #include "Log.h" #include "ObjectMgr.h" #include "ProgressBar.h" +#include "Util.h" + #include #include -#include "Util.h" struct EnchStoreItem { diff --git a/src/game/Object/LootMgr.cpp b/src/game/Object/LootMgr.cpp index 017469d94..14e748fa8 100644 --- a/src/game/Object/LootMgr.cpp +++ b/src/game/Object/LootMgr.cpp @@ -32,6 +32,7 @@ #include "SpellMgr.h" #include "DBCStores.h" #include "SQLStorages.h" +#include "ItemEnchantmentMgr.h" static eConfigFloatValues const qualityToRate[MAX_ITEM_QUALITY] = { diff --git a/src/game/Object/LootMgr.h b/src/game/Object/LootMgr.h index 99060626c..4cb883c15 100644 --- a/src/game/Object/LootMgr.h +++ b/src/game/Object/LootMgr.h @@ -25,12 +25,10 @@ #ifndef MANGOS_LOOTMGR_H #define MANGOS_LOOTMGR_H -#include "ItemEnchantmentMgr.h" #include "ByteBuffer.h" #include "ObjectGuid.h" #include "Utilities/LinkedReference/RefManager.h" -#include #include class Player; diff --git a/src/game/Object/Object.cpp b/src/game/Object/Object.cpp index faece63f8..be1f4e2e0 100644 --- a/src/game/Object/Object.cpp +++ b/src/game/Object/Object.cpp @@ -37,11 +37,6 @@ #include "UpdateMask.h" #include "Util.h" #include "MapManager.h" -#include "Log.h" -#include "Transports.h" -#include "TargetedMovementGenerator.h" -#include "WaypointMovementGenerator.h" -#include "VMapFactory.h" #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" diff --git a/src/game/Object/Object.h b/src/game/Object/Object.h index eea8e395c..0eed1d512 100644 --- a/src/game/Object/Object.h +++ b/src/game/Object/Object.h @@ -34,7 +34,6 @@ #include "Util.h" #include -#include #define CONTACT_DISTANCE 0.5f #define INTERACTION_DISTANCE 5.0f diff --git a/src/game/Object/ObjectAccessor.cpp b/src/game/Object/ObjectAccessor.cpp index 36f99fba0..bfb303f04 100644 --- a/src/game/Object/ObjectAccessor.cpp +++ b/src/game/Object/ObjectAccessor.cpp @@ -26,21 +26,14 @@ #include "ObjectMgr.h" #include "Policies/Singleton.h" #include "Player.h" -#include "WorldPacket.h" #include "Item.h" #include "Corpse.h" -#include "GridNotifiers.h" #include "MapManager.h" #include "Map.h" #include "CellImpl.h" #include "GridNotifiersImpl.h" #include "ObjectGuid.h" #include "World.h" - -#include - -#include - #define CLASS_LOCK MaNGOS::ClassLevelLockable INSTANTIATE_SINGLETON_2(ObjectAccessor, CLASS_LOCK); INSTANTIATE_CLASS_MUTEX(ObjectAccessor, ACE_Thread_Mutex); diff --git a/src/game/Object/ObjectAccessor.h b/src/game/Object/ObjectAccessor.h index f1ecfa288..9feeac983 100644 --- a/src/game/Object/ObjectAccessor.h +++ b/src/game/Object/ObjectAccessor.h @@ -40,11 +40,6 @@ #include "Player.h" #include "Corpse.h" -#include - -#include -#include - class Unit; class WorldObject; class Map; diff --git a/src/game/Object/ObjectGuid.h b/src/game/Object/ObjectGuid.h index 74e795750..14b11e95a 100644 --- a/src/game/Object/ObjectGuid.h +++ b/src/game/Object/ObjectGuid.h @@ -28,8 +28,6 @@ #include "Common.h" #include "ByteBuffer.h" -#include - enum TypeID { TYPEID_OBJECT = 0, diff --git a/src/game/Object/ObjectMgr.cpp b/src/game/Object/ObjectMgr.cpp index eeeb90050..e0500b12f 100644 --- a/src/game/Object/ObjectMgr.cpp +++ b/src/game/Object/ObjectMgr.cpp @@ -32,7 +32,6 @@ #include "ObjectGuid.h" #include "ScriptMgr.h" #include "SpellMgr.h" -#include "UpdateMask.h" #include "World.h" #include "Group.h" #include "ArenaTeam.h" @@ -41,13 +40,10 @@ #include "Language.h" #include "PoolManager.h" #include "GameEventMgr.h" -#include "Spell.h" #include "Chat.h" -#include "AccountMgr.h" #include "MapPersistentStateMgr.h" #include "SpellAuras.h" #include "Util.h" -#include "WaypointManager.h" #include "GossipDef.h" #include "Mail.h" #include "InstanceData.h" @@ -57,6 +53,7 @@ #include "GridNotifiersImpl.h" #include "CellImpl.h" +#include "ItemEnchantmentMgr.h" #include INSTANTIATE_SINGLETON_1(ObjectMgr); diff --git a/src/game/Object/ObjectMgr.h b/src/game/Object/ObjectMgr.h index 97e9a5ca0..cdeea3854 100644 --- a/src/game/Object/ObjectMgr.h +++ b/src/game/Object/ObjectMgr.h @@ -26,13 +26,11 @@ #define _OBJECTMGR_H #include "Common.h" -#include "Log.h" #include "Object.h" #include "Bag.h" #include "Creature.h" #include "Player.h" #include "GameObject.h" -#include "Corpse.h" #include "QuestDef.h" #include "ItemPrototype.h" #include "NPCHandler.h" @@ -43,7 +41,6 @@ #include "ObjectGuid.h" #include "Policies/Singleton.h" -#include #include #include diff --git a/src/game/Object/Pet.cpp b/src/game/Object/Pet.cpp index 34c8d2bf5..56504322b 100644 --- a/src/game/Object/Pet.cpp +++ b/src/game/Object/Pet.cpp @@ -30,9 +30,7 @@ #include "SpellMgr.h" #include "Formulas.h" #include "SpellAuras.h" -#include "CreatureAI.h" #include "Unit.h" -#include "Util.h" Pet::Pet(PetType type) : Creature(CREATURE_SUBTYPE_PET), diff --git a/src/game/Object/PetAI.cpp b/src/game/Object/PetAI.cpp index 130abf3e0..8500cd9f0 100644 --- a/src/game/Object/PetAI.cpp +++ b/src/game/Object/PetAI.cpp @@ -28,7 +28,6 @@ #include "Player.h" #include "DBCStores.h" #include "Spell.h" -#include "ObjectAccessor.h" #include "SpellMgr.h" #include "Creature.h" #include "World.h" diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp index 7086d939a..3ab42c9db 100644 --- a/src/game/Object/Player.cpp +++ b/src/game/Object/Player.cpp @@ -46,7 +46,6 @@ #include "CellImpl.h" #include "ObjectMgr.h" #include "ObjectAccessor.h" -#include "CreatureAI.h" #include "Formulas.h" #include "Group.h" #include "Guild.h" diff --git a/src/game/Object/Player.h b/src/game/Object/Player.h index b41f393d1..ca9d21200 100644 --- a/src/game/Object/Player.h +++ b/src/game/Object/Player.h @@ -31,7 +31,6 @@ #include "Item.h" #include "Database/DatabaseEnv.h" -#include "NPCHandler.h" #include "QuestDef.h" #include "Group.h" #include "Bag.h" @@ -45,7 +44,6 @@ #include "SharedDefines.h" #include "Chat.h" -#include #include struct Mail; diff --git a/src/game/Object/ReactorAI.cpp b/src/game/Object/ReactorAI.cpp index 59b0cb64a..70ccfc08a 100644 --- a/src/game/Object/ReactorAI.cpp +++ b/src/game/Object/ReactorAI.cpp @@ -22,9 +22,7 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ -#include "ByteBuffer.h" #include "ReactorAI.h" -#include "Errors.h" #include "Creature.h" #include "Map.h" #include "Log.h" diff --git a/src/game/Object/SocialMgr.h b/src/game/Object/SocialMgr.h index f917de313..ae3e1544e 100644 --- a/src/game/Object/SocialMgr.h +++ b/src/game/Object/SocialMgr.h @@ -25,7 +25,6 @@ #ifndef __MANGOS_SOCIALMGR_H #define __MANGOS_SOCIALMGR_H -#include "Policies/Singleton.h" #include "Database/DatabaseEnv.h" #include "ObjectGuid.h" diff --git a/src/game/Object/SpellMgr.cpp b/src/game/Object/SpellMgr.cpp index 6d7600c7f..2355ed1d9 100644 --- a/src/game/Object/SpellMgr.cpp +++ b/src/game/Object/SpellMgr.cpp @@ -28,12 +28,10 @@ #include "ProgressBar.h" #include "DBCStores.h" #include "SQLStorages.h" -#include "World.h" #include "Chat.h" #include "Spell.h" -#include "BattleGround/BattleGroundMgr.h" -#include "MapManager.h" #include "Unit.h" +#include "World.h" bool IsPrimaryProfessionSkill(uint32 skill) { diff --git a/src/game/Object/Totem.cpp b/src/game/Object/Totem.cpp index aa60cabc0..1e5a192d7 100644 --- a/src/game/Object/Totem.cpp +++ b/src/game/Object/Totem.cpp @@ -23,7 +23,6 @@ */ #include "Totem.h" -#include "WorldPacket.h" #include "Log.h" #include "Group.h" #include "Player.h" diff --git a/src/game/Object/TotemAI.cpp b/src/game/Object/TotemAI.cpp index 5b3216b85..89f3c1c9e 100644 --- a/src/game/Object/TotemAI.cpp +++ b/src/game/Object/TotemAI.cpp @@ -27,7 +27,6 @@ #include "Creature.h" #include "DBCStores.h" #include "SpellMgr.h" - #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "CellImpl.h" diff --git a/src/game/Object/TotemAI.h b/src/game/Object/TotemAI.h index 4d039a50f..71a208b24 100644 --- a/src/game/Object/TotemAI.h +++ b/src/game/Object/TotemAI.h @@ -27,7 +27,6 @@ #include "CreatureAI.h" #include "ObjectGuid.h" -#include "Timer.h" class Creature; class Totem; diff --git a/src/game/Object/Unit.cpp b/src/game/Object/Unit.cpp index 42e4be8c3..97f8daa8c 100644 --- a/src/game/Object/Unit.cpp +++ b/src/game/Object/Unit.cpp @@ -31,17 +31,14 @@ #include "ObjectMgr.h" #include "ObjectGuid.h" #include "SpellMgr.h" -#include "QuestDef.h" #include "Player.h" #include "Creature.h" #include "Spell.h" #include "Group.h" #include "SpellAuras.h" -#include "MapManager.h" #include "ObjectAccessor.h" #include "CreatureAI.h" #include "TemporarySummon.h" -#include "Formulas.h" #include "Pet.h" #include "Util.h" #include "Totem.h" @@ -52,7 +49,6 @@ #include "MapPersistentStateMgr.h" #include "GridNotifiersImpl.h" #include "CellImpl.h" -#include "VMapFactory.h" #include "MovementGenerator.h" #include "movement/MoveSplineInit.h" #include "movement/MoveSpline.h" @@ -64,7 +60,6 @@ #endif /* ENABLE_ELUNA */ #include -#include float baseMoveSpeed[MAX_MOVE_TYPE] = { diff --git a/src/game/Object/Unit.h b/src/game/Object/Unit.h index 2389b3b3b..aa9dd3f54 100644 --- a/src/game/Object/Unit.h +++ b/src/game/Object/Unit.h @@ -43,9 +43,10 @@ #include "Utilities/EventProcessor.h" #include "MotionMaster.h" #include "DBCStructure.h" -#include "Path.h" #include "WorldPacket.h" #include "Timer.h" +#include "Log.h" + #include enum SpellInterruptFlags diff --git a/src/game/Object/UpdateMask.h b/src/game/Object/UpdateMask.h index d4cf6d267..f696536e5 100644 --- a/src/game/Object/UpdateMask.h +++ b/src/game/Object/UpdateMask.h @@ -25,7 +25,6 @@ #ifndef __UPDATEMASK_H #define __UPDATEMASK_H -#include "UpdateFields.h" #include "Errors.h" class UpdateMask diff --git a/src/game/OutdoorPvP/OutdoorPvP.cpp b/src/game/OutdoorPvP/OutdoorPvP.cpp index 7652ab4c0..1adf1d82d 100644 --- a/src/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/game/OutdoorPvP/OutdoorPvP.cpp @@ -20,8 +20,6 @@ */ #include "OutdoorPvP.h" -#include "Language.h" -#include "World.h" #include "ObjectMgr.h" #include "Object.h" #include "GameObject.h" diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.h b/src/game/OutdoorPvP/OutdoorPvPMgr.h index 23f276922..fdc4ac281 100644 --- a/src/game/OutdoorPvP/OutdoorPvPMgr.h +++ b/src/game/OutdoorPvP/OutdoorPvPMgr.h @@ -23,7 +23,6 @@ #define WORLD_PVP_MGR_H #include "Common.h" -#include "Policies/Singleton.h" #include "Timer.h" enum diff --git a/src/game/OutdoorPvP/OutdoorPvPSI.cpp b/src/game/OutdoorPvP/OutdoorPvPSI.cpp index f3fb46c82..2c0490260 100644 --- a/src/game/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/game/OutdoorPvP/OutdoorPvPSI.cpp @@ -27,6 +27,7 @@ #include "Creature.h" #include "GameObject.h" #include "Player.h" +#include "Language.h" OutdoorPvPSI::OutdoorPvPSI() : OutdoorPvP(), m_resourcesAlliance(0), diff --git a/src/game/OutdoorPvP/OutdoorPvPSI.h b/src/game/OutdoorPvP/OutdoorPvPSI.h index f493fb7d1..00ca867af 100644 --- a/src/game/OutdoorPvP/OutdoorPvPSI.h +++ b/src/game/OutdoorPvP/OutdoorPvPSI.h @@ -24,7 +24,6 @@ #include "Common.h" #include "OutdoorPvP.h" -#include "Language.h" enum { diff --git a/src/game/References/GroupReference.cpp b/src/game/References/GroupReference.cpp index f017f42b0..09aaed14d 100644 --- a/src/game/References/GroupReference.cpp +++ b/src/game/References/GroupReference.cpp @@ -22,7 +22,6 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ -#include "Player.h" #include "Group.h" #include "GroupReference.h" diff --git a/src/game/Server/DBCStores.cpp b/src/game/Server/DBCStores.cpp index 22a807d2a..b506b4938 100644 --- a/src/game/Server/DBCStores.cpp +++ b/src/game/Server/DBCStores.cpp @@ -28,8 +28,6 @@ #include "Log.h" #include "ProgressBar.h" #include "SharedDefines.h" -#include "SpellAuraDefines.h" -#include "ObjectGuid.h" #include "DBCfmt.h" diff --git a/src/game/Server/DBCStructure.h b/src/game/Server/DBCStructure.h index 011c6e0ae..58e6dde2a 100644 --- a/src/game/Server/DBCStructure.h +++ b/src/game/Server/DBCStructure.h @@ -25,7 +25,6 @@ #ifndef MANGOS_DBCSTRUCTURE_H #define MANGOS_DBCSTRUCTURE_H -#include "Common.h" #include "DBCEnums.h" #include "Path.h" #include "Platform/Define.h" diff --git a/src/game/Server/SQLStorages.h b/src/game/Server/SQLStorages.h index c37d4ab55..b3302857d 100644 --- a/src/game/Server/SQLStorages.h +++ b/src/game/Server/SQLStorages.h @@ -25,7 +25,6 @@ #ifndef MANGOS_SQLSTORAGES_H #define MANGOS_SQLSTORAGES_H -#include "Common.h" #include "Database/SQLStorage.h" extern SQLStorage sCreatureStorage; diff --git a/src/game/Server/SharedDefines.h b/src/game/Server/SharedDefines.h index 2f64d3a6f..203b48ecc 100644 --- a/src/game/Server/SharedDefines.h +++ b/src/game/Server/SharedDefines.h @@ -26,7 +26,6 @@ #define MANGOS_SHAREDDEFINES_H #include "Platform/Define.h" -#include #ifndef MANGOS #define MANGOS diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp index ccea09412..4200e4178 100644 --- a/src/game/Server/WorldSession.cpp +++ b/src/game/Server/WorldSession.cpp @@ -41,7 +41,6 @@ #include "World.h" #include "ObjectAccessor.h" #include "BattleGround/BattleGroundMgr.h" -#include "MapManager.h" #include "SocialMgr.h" #ifdef ENABLE_ELUNA #include "LuaEngine.h" diff --git a/src/game/Tools/PlayerDump.h b/src/game/Tools/PlayerDump.h index 86ef7bf97..78cbe4010 100644 --- a/src/game/Tools/PlayerDump.h +++ b/src/game/Tools/PlayerDump.h @@ -25,8 +25,6 @@ #ifndef _PLAYER_DUMP_H #define _PLAYER_DUMP_H -#include -#include #include enum DumpTableType diff --git a/src/game/WorldHandlers/AccountMgr.h b/src/game/WorldHandlers/AccountMgr.h index 66fa3b0fa..f7c53a2b5 100644 --- a/src/game/WorldHandlers/AccountMgr.h +++ b/src/game/WorldHandlers/AccountMgr.h @@ -26,8 +26,6 @@ #define _ACCMGR_H #include "Common.h" -#include "Policies/Singleton.h" -#include enum AccountOpResult { diff --git a/src/game/WorldHandlers/AuctionHouseHandler.cpp b/src/game/WorldHandlers/AuctionHouseHandler.cpp index b70adc250..34be04922 100644 --- a/src/game/WorldHandlers/AuctionHouseHandler.cpp +++ b/src/game/WorldHandlers/AuctionHouseHandler.cpp @@ -30,7 +30,6 @@ #include "ObjectMgr.h" #include "ObjectGuid.h" #include "Player.h" -#include "UpdateMask.h" #include "AuctionHouseMgr.h" #include "Mail.h" #include "Util.h" diff --git a/src/game/WorldHandlers/Cell.h b/src/game/WorldHandlers/Cell.h index 76be4baed..18cb35e21 100644 --- a/src/game/WorldHandlers/Cell.h +++ b/src/game/WorldHandlers/Cell.h @@ -25,10 +25,8 @@ #ifndef MANGOS_CELL_H #define MANGOS_CELL_H -#include "GameSystem/TypeContainer.h" #include "GameSystem/TypeContainerVisitor.h" #include "GridDefines.h" -#include class Map; class WorldObject; diff --git a/src/game/WorldHandlers/Channel.h b/src/game/WorldHandlers/Channel.h index bff7e253e..f2f24fadd 100644 --- a/src/game/WorldHandlers/Channel.h +++ b/src/game/WorldHandlers/Channel.h @@ -28,12 +28,9 @@ #include "Common.h" #include "ObjectGuid.h" #include "WorldPacket.h" -#include "Opcodes.h" #include "Player.h" -#include #include -#include enum ChatNotify { diff --git a/src/game/WorldHandlers/ChannelMgr.h b/src/game/WorldHandlers/ChannelMgr.h index 034a8dee8..9a5b2b99b 100644 --- a/src/game/WorldHandlers/ChannelMgr.h +++ b/src/game/WorldHandlers/ChannelMgr.h @@ -26,10 +26,8 @@ #include "Common.h" #include "Channel.h" -#include "Policies/Singleton.h" #include -#include class ChannelMgr { diff --git a/src/game/WorldHandlers/Chat.cpp b/src/game/WorldHandlers/Chat.cpp index c6b3a1581..5f235f5ff 100644 --- a/src/game/WorldHandlers/Chat.cpp +++ b/src/game/WorldHandlers/Chat.cpp @@ -33,7 +33,6 @@ #include "ObjectMgr.h" #include "ObjectGuid.h" #include "Player.h" -#include "UpdateMask.h" #include "GridNotifiersImpl.h" #include "CellImpl.h" #include "AccountMgr.h" diff --git a/src/game/WorldHandlers/ChatHandler.cpp b/src/game/WorldHandlers/ChatHandler.cpp index de9dd947e..096b3dd18 100644 --- a/src/game/WorldHandlers/ChatHandler.cpp +++ b/src/game/WorldHandlers/ChatHandler.cpp @@ -30,7 +30,6 @@ #include "Opcodes.h" #include "ObjectMgr.h" #include "Chat.h" -#include "Database/DatabaseEnv.h" #include "ChannelMgr.h" #include "Group.h" #include "Guild.h" diff --git a/src/game/WorldHandlers/CombatHandler.cpp b/src/game/WorldHandlers/CombatHandler.cpp index a2e6c62ab..3bb83d186 100644 --- a/src/game/WorldHandlers/CombatHandler.cpp +++ b/src/game/WorldHandlers/CombatHandler.cpp @@ -26,7 +26,6 @@ #include "Log.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "CreatureAI.h" #include "ObjectGuid.h" #include "Player.h" diff --git a/src/game/WorldHandlers/DuelHandler.cpp b/src/game/WorldHandlers/DuelHandler.cpp index 020e6632a..ec55b34a3 100644 --- a/src/game/WorldHandlers/DuelHandler.cpp +++ b/src/game/WorldHandlers/DuelHandler.cpp @@ -26,8 +26,6 @@ #include "WorldPacket.h" #include "WorldSession.h" #include "Log.h" -#include "Opcodes.h" -#include "UpdateData.h" #include "Player.h" void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket) diff --git a/src/game/WorldHandlers/GameEventMgr.cpp b/src/game/WorldHandlers/GameEventMgr.cpp index d99d866d6..5fb5c6584 100644 --- a/src/game/WorldHandlers/GameEventMgr.cpp +++ b/src/game/WorldHandlers/GameEventMgr.cpp @@ -33,7 +33,6 @@ #include "MapManager.h" #include "BattleGround/BattleGroundMgr.h" #include "MassMailMgr.h" -#include "SpellMgr.h" #include "Policies/Singleton.h" INSTANTIATE_SINGLETON_1(GameEventMgr); diff --git a/src/game/WorldHandlers/GameEventMgr.h b/src/game/WorldHandlers/GameEventMgr.h index 35cfee731..c694ba268 100644 --- a/src/game/WorldHandlers/GameEventMgr.h +++ b/src/game/WorldHandlers/GameEventMgr.h @@ -28,7 +28,6 @@ #include "Common.h" #include "SharedDefines.h" #include "Platform/Define.h" -#include "Policies/Singleton.h" #include diff --git a/src/game/WorldHandlers/GridMap.cpp b/src/game/WorldHandlers/GridMap.cpp index f0144e941..199f6fa60 100644 --- a/src/game/WorldHandlers/GridMap.cpp +++ b/src/game/WorldHandlers/GridMap.cpp @@ -22,9 +22,7 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ -#include "MapManager.h" #include "Log.h" -#include "GridStates.h" #include "CellImpl.h" #include "Map.h" #include "DBCEnums.h" diff --git a/src/game/WorldHandlers/GridMap.h b/src/game/WorldHandlers/GridMap.h index 1d43d394c..a5ff83e38 100644 --- a/src/game/WorldHandlers/GridMap.h +++ b/src/game/WorldHandlers/GridMap.h @@ -27,10 +27,7 @@ #include "Platform/Define.h" #include "Policies/Singleton.h" -#include "DBCStructure.h" #include "GridDefines.h" -#include "Object.h" -#include "SharedDefines.h" #include #include diff --git a/src/game/WorldHandlers/GridNotifiers.cpp b/src/game/WorldHandlers/GridNotifiers.cpp index 0c9a9857b..ecfbccca8 100644 --- a/src/game/WorldHandlers/GridNotifiers.cpp +++ b/src/game/WorldHandlers/GridNotifiers.cpp @@ -26,7 +26,6 @@ #include "WorldPacket.h" #include "WorldSession.h" #include "UpdateData.h" -#include "Item.h" #include "Map.h" #include "Transports.h" #include "ObjectAccessor.h" diff --git a/src/game/WorldHandlers/GridNotifiers.h b/src/game/WorldHandlers/GridNotifiers.h index cbda55c9d..2e9e77315 100644 --- a/src/game/WorldHandlers/GridNotifiers.h +++ b/src/game/WorldHandlers/GridNotifiers.h @@ -25,9 +25,7 @@ #ifndef MANGOS_GRIDNOTIFIERS_H #define MANGOS_GRIDNOTIFIERS_H -#include "ObjectGridLoader.h" #include "UpdateData.h" -#include #include "Corpse.h" #include "Object.h" diff --git a/src/game/WorldHandlers/GridNotifiersImpl.h b/src/game/WorldHandlers/GridNotifiersImpl.h index 533fa38e5..7f3117fc3 100644 --- a/src/game/WorldHandlers/GridNotifiersImpl.h +++ b/src/game/WorldHandlers/GridNotifiersImpl.h @@ -27,9 +27,7 @@ #include "GridNotifiers.h" #include "WorldPacket.h" -#include "Corpse.h" #include "Player.h" -#include "UpdateData.h" #include "CreatureAI.h" #include "SpellAuras.h" #include "DBCEnums.h" diff --git a/src/game/WorldHandlers/GridStates.cpp b/src/game/WorldHandlers/GridStates.cpp index 4885cc855..1c964da18 100644 --- a/src/game/WorldHandlers/GridStates.cpp +++ b/src/game/WorldHandlers/GridStates.cpp @@ -23,8 +23,7 @@ */ #include "GridStates.h" -#include "GridNotifiers.h" -#include "GameSystem/Grid.h" +#include "ObjectGridLoader.h" #include "Log.h" void diff --git a/src/game/WorldHandlers/Group.cpp b/src/game/WorldHandlers/Group.cpp index 3debbd12f..cd55558da 100644 --- a/src/game/WorldHandlers/Group.cpp +++ b/src/game/WorldHandlers/Group.cpp @@ -27,7 +27,6 @@ #include "WorldPacket.h" #include "WorldSession.h" #include "Player.h" -#include "World.h" #include "ObjectMgr.h" #include "ObjectGuid.h" #include "Group.h" @@ -36,7 +35,6 @@ #include "BattleGround/BattleGround.h" #include "MapManager.h" #include "MapPersistentStateMgr.h" -#include "Util.h" #include "LootMgr.h" #ifdef ENABLE_ELUNA diff --git a/src/game/WorldHandlers/Group.h b/src/game/WorldHandlers/Group.h index fa9d8aab3..0c9143386 100644 --- a/src/game/WorldHandlers/Group.h +++ b/src/game/WorldHandlers/Group.h @@ -34,11 +34,6 @@ #include "DBCEnums.h" #include "SharedDefines.h" -#include -#include - -struct ItemPrototype; - class WorldSession; class Map; class BattleGround; diff --git a/src/game/WorldHandlers/GuildHandler.cpp b/src/game/WorldHandlers/GuildHandler.cpp index 9fd93e112..7c7480734 100644 --- a/src/game/WorldHandlers/GuildHandler.cpp +++ b/src/game/WorldHandlers/GuildHandler.cpp @@ -31,7 +31,6 @@ #include "Opcodes.h" #include "Guild.h" #include "GuildMgr.h" -#include "GossipDef.h" #include "SocialMgr.h" #include "Calendar.h" #ifdef ENABLE_ELUNA diff --git a/src/game/WorldHandlers/GuildMgr.h b/src/game/WorldHandlers/GuildMgr.h index 732869d42..02969bdd2 100644 --- a/src/game/WorldHandlers/GuildMgr.h +++ b/src/game/WorldHandlers/GuildMgr.h @@ -26,7 +26,6 @@ #define _GUILDMGR_H #include "Common.h" -#include "Policies/Singleton.h" class Guild; class ObjectGuid; diff --git a/src/game/WorldHandlers/LootHandler.cpp b/src/game/WorldHandlers/LootHandler.cpp index 711bfc920..c6e843563 100644 --- a/src/game/WorldHandlers/LootHandler.cpp +++ b/src/game/WorldHandlers/LootHandler.cpp @@ -25,8 +25,6 @@ #include "Common.h" #include "WorldPacket.h" #include "Log.h" -#include "Corpse.h" -#include "GameObject.h" #include "Player.h" #include "ObjectAccessor.h" #include "ObjectGuid.h" @@ -34,9 +32,7 @@ #include "LootMgr.h" #include "Object.h" #include "Group.h" -#include "World.h" -#include "Util.h" -#include "DBCStores.h" + #ifdef ENABLE_ELUNA #include "LuaEngine.h" #endif /* ENABLE_ELUNA */ diff --git a/src/game/WorldHandlers/Map.cpp b/src/game/WorldHandlers/Map.cpp index c0782c6cb..3b649c30d 100644 --- a/src/game/WorldHandlers/Map.cpp +++ b/src/game/WorldHandlers/Map.cpp @@ -27,7 +27,6 @@ #include "Player.h" #include "GridNotifiers.h" #include "Log.h" -#include "GridStates.h" #include "CellImpl.h" #include "InstanceData.h" #include "GridNotifiersImpl.h" @@ -42,10 +41,13 @@ #include "MapPersistentStateMgr.h" #include "VMapFactory.h" #include "MoveMap.h" -#include "BattleGround/BattleGroundMgr.h" +//#include "BattleGround/BattleGroundMgr.h" #include "Calendar.h" #include "Chat.h" #include "Weather.h" +#include "Transports.h" +#include "ObjectGridLoader.h" + #ifdef ENABLE_ELUNA #include "LuaEngine.h" #endif /* ENABLE_ELUNA */ diff --git a/src/game/WorldHandlers/Map.h b/src/game/WorldHandlers/Map.h index e5839a7ca..0f1c2633a 100644 --- a/src/game/WorldHandlers/Map.h +++ b/src/game/WorldHandlers/Map.h @@ -35,18 +35,15 @@ #include "GridDefines.h" #include "Cell.h" #include "Object.h" -#include "Timer.h" #include "SharedDefines.h" #include "GridMap.h" #include "GameSystem/GridRefManager.h" #include "MapRefManager.h" -#include "Utilities/TypeList.h" #include "ScriptMgr.h" #include "CreatureLinkingMgr.h" #include "DynamicTree.h" #include -#include struct CreatureInfo; class Creature; diff --git a/src/game/WorldHandlers/MapManager.cpp b/src/game/WorldHandlers/MapManager.cpp index 862592e9b..665b7ae64 100644 --- a/src/game/WorldHandlers/MapManager.cpp +++ b/src/game/WorldHandlers/MapManager.cpp @@ -31,7 +31,6 @@ #include "GridDefines.h" #include "World.h" #include "CellImpl.h" -#include "Corpse.h" #include "ObjectMgr.h" #define CLASS_LOCK MaNGOS::ClassLevelLockable diff --git a/src/game/WorldHandlers/MapPersistentStateMgr.cpp b/src/game/WorldHandlers/MapPersistentStateMgr.cpp index c6e55a83f..f516b06ca 100644 --- a/src/game/WorldHandlers/MapPersistentStateMgr.cpp +++ b/src/game/WorldHandlers/MapPersistentStateMgr.cpp @@ -26,15 +26,12 @@ #include "SQLStorages.h" #include "Player.h" -#include "GridNotifiers.h" #include "Log.h" -#include "GridStates.h" #include "CellImpl.h" #include "Map.h" #include "MapManager.h" #include "Timer.h" #include "GridNotifiersImpl.h" -#include "Transports.h" #include "ObjectMgr.h" #include "GameEventMgr.h" #include "World.h" diff --git a/src/game/WorldHandlers/MassMailMgr.h b/src/game/WorldHandlers/MassMailMgr.h index 0e80c9652..cd2d10fca 100644 --- a/src/game/WorldHandlers/MassMailMgr.h +++ b/src/game/WorldHandlers/MassMailMgr.h @@ -42,9 +42,6 @@ #include "Common.h" #include "Mail.h" -#include "Policies/Singleton.h" - -#include /** * A class to represent the mail send factory to multiple (often all existing) characters. diff --git a/src/game/WorldHandlers/MiscHandler.cpp b/src/game/WorldHandlers/MiscHandler.cpp index 7e7cab627..0f68d7578 100644 --- a/src/game/WorldHandlers/MiscHandler.cpp +++ b/src/game/WorldHandlers/MiscHandler.cpp @@ -34,8 +34,6 @@ #include "GuildMgr.h" #include "ObjectMgr.h" #include "WorldSession.h" -#include "Auth/BigNumber.h" -#include "Auth/Sha1.h" #include "UpdateData.h" #include "LootMgr.h" #include "Chat.h" diff --git a/src/game/WorldHandlers/MoveMap.cpp b/src/game/WorldHandlers/MoveMap.cpp index 92c5298a8..5de419d7d 100644 --- a/src/game/WorldHandlers/MoveMap.cpp +++ b/src/game/WorldHandlers/MoveMap.cpp @@ -22,11 +22,9 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ -#include "GridMap.h" #include "Log.h" #include "World.h" #include "Creature.h" - #include "MoveMap.h" #include "MoveMapSharedDefines.h" diff --git a/src/game/WorldHandlers/MovementHandler.cpp b/src/game/WorldHandlers/MovementHandler.cpp index b37e165f3..5aa341377 100644 --- a/src/game/WorldHandlers/MovementHandler.cpp +++ b/src/game/WorldHandlers/MovementHandler.cpp @@ -27,7 +27,6 @@ #include "WorldSession.h" #include "Opcodes.h" #include "Log.h" -#include "Corpse.h" #include "Player.h" #include "Vehicle.h" #include "SpellAuras.h" diff --git a/src/game/WorldHandlers/NPCHandler.cpp b/src/game/WorldHandlers/NPCHandler.cpp index d238b76ac..20707c2d6 100644 --- a/src/game/WorldHandlers/NPCHandler.cpp +++ b/src/game/WorldHandlers/NPCHandler.cpp @@ -33,7 +33,6 @@ #include "SpellMgr.h" #include "Player.h" #include "GossipDef.h" -#include "UpdateMask.h" #include "ScriptMgr.h" #include "Creature.h" #include "Pet.h" diff --git a/src/game/WorldHandlers/ObjectGridLoader.cpp b/src/game/WorldHandlers/ObjectGridLoader.cpp index 6b7f02ca1..a8c2ddd0d 100644 --- a/src/game/WorldHandlers/ObjectGridLoader.cpp +++ b/src/game/WorldHandlers/ObjectGridLoader.cpp @@ -27,7 +27,6 @@ #include "ObjectMgr.h" #include "MapPersistentStateMgr.h" #include "Creature.h" -#include "GameObject.h" #include "DynamicObject.h" #include "Corpse.h" #include "World.h" diff --git a/src/game/WorldHandlers/ObjectGridLoader.h b/src/game/WorldHandlers/ObjectGridLoader.h index 815fb2514..7404ee152 100644 --- a/src/game/WorldHandlers/ObjectGridLoader.h +++ b/src/game/WorldHandlers/ObjectGridLoader.h @@ -26,7 +26,6 @@ #define MANGOS_OBJECTGRIDLOADER_H #include "Common.h" -#include "Utilities/TypeList.h" #include "Platform/Define.h" #include "GameSystem/GridLoader.h" #include "GridDefines.h" diff --git a/src/game/WorldHandlers/PoolManager.cpp b/src/game/WorldHandlers/PoolManager.cpp index e802d6acb..5f7332d8c 100644 --- a/src/game/WorldHandlers/PoolManager.cpp +++ b/src/game/WorldHandlers/PoolManager.cpp @@ -28,7 +28,6 @@ #include "ProgressBar.h" #include "Log.h" #include "MapPersistentStateMgr.h" -#include "MapManager.h" #include "World.h" #include "Policies/Singleton.h" diff --git a/src/game/WorldHandlers/PoolManager.h b/src/game/WorldHandlers/PoolManager.h index 5e5a37e25..fc8017b49 100644 --- a/src/game/WorldHandlers/PoolManager.h +++ b/src/game/WorldHandlers/PoolManager.h @@ -27,7 +27,6 @@ #include "Common.h" #include "Platform/Define.h" -#include "Policies/Singleton.h" #include "Creature.h" #include "GameObject.h" diff --git a/src/game/WorldHandlers/QueryHandler.cpp b/src/game/WorldHandlers/QueryHandler.cpp index c433c3746..313150575 100644 --- a/src/game/WorldHandlers/QueryHandler.cpp +++ b/src/game/WorldHandlers/QueryHandler.cpp @@ -34,10 +34,7 @@ #include "ObjectMgr.h" #include "ObjectGuid.h" #include "Player.h" -#include "UpdateMask.h" #include "NPCHandler.h" -#include "Pet.h" -#include "MapManager.h" #include "SQLStorages.h" void WorldSession::SendNameQueryOpcode(Player* p) diff --git a/src/game/WorldHandlers/QuestDef.h b/src/game/WorldHandlers/QuestDef.h index 604d701db..172379aeb 100644 --- a/src/game/WorldHandlers/QuestDef.h +++ b/src/game/WorldHandlers/QuestDef.h @@ -28,7 +28,6 @@ #include "Platform/Define.h" #include "Database/DatabaseEnv.h" -#include #include class Player; diff --git a/src/game/WorldHandlers/ScriptMgr.cpp b/src/game/WorldHandlers/ScriptMgr.cpp index d15d1001d..441a60fdb 100644 --- a/src/game/WorldHandlers/ScriptMgr.cpp +++ b/src/game/WorldHandlers/ScriptMgr.cpp @@ -28,7 +28,6 @@ #include "ProgressBar.h" #include "ObjectMgr.h" #include "WaypointManager.h" -#include "World.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "Cell.h" diff --git a/src/game/WorldHandlers/ScriptMgr.h b/src/game/WorldHandlers/ScriptMgr.h index 8b84158cb..0d2474f47 100644 --- a/src/game/WorldHandlers/ScriptMgr.h +++ b/src/game/WorldHandlers/ScriptMgr.h @@ -26,7 +26,6 @@ #define MANGOS_H_SCRIPTMGR #include "Common.h" -#include "Policies/Singleton.h" #include "ObjectGuid.h" #include "DBCEnums.h" //#include <- delete this if the #include below works diff --git a/src/game/WorldHandlers/SkillHandler.cpp b/src/game/WorldHandlers/SkillHandler.cpp index 98fc624a4..2f0885427 100644 --- a/src/game/WorldHandlers/SkillHandler.cpp +++ b/src/game/WorldHandlers/SkillHandler.cpp @@ -23,14 +23,11 @@ */ #include "Common.h" -#include "Database/DatabaseEnv.h" -#include "DBCStores.h" #include "Opcodes.h" #include "Log.h" #include "Player.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "UpdateMask.h" void WorldSession::HandleLearnTalentOpcode(WorldPacket& recv_data) { diff --git a/src/game/WorldHandlers/Spell.cpp b/src/game/WorldHandlers/Spell.cpp index e99585d93..3accd16b2 100644 --- a/src/game/WorldHandlers/Spell.cpp +++ b/src/game/WorldHandlers/Spell.cpp @@ -30,7 +30,6 @@ #include "GridNotifiersImpl.h" #include "Opcodes.h" #include "Log.h" -#include "UpdateMask.h" #include "World.h" #include "ObjectMgr.h" #include "SpellMgr.h" @@ -40,7 +39,6 @@ #include "DynamicObject.h" #include "Group.h" #include "UpdateData.h" -#include "MapManager.h" #include "ObjectAccessor.h" #include "CellImpl.h" #include "Policies/Singleton.h" diff --git a/src/game/WorldHandlers/SpellAuras.cpp b/src/game/WorldHandlers/SpellAuras.cpp index 8b9dd5faf..22ffc8592 100644 --- a/src/game/WorldHandlers/SpellAuras.cpp +++ b/src/game/WorldHandlers/SpellAuras.cpp @@ -28,7 +28,6 @@ #include "WorldSession.h" #include "Opcodes.h" #include "Log.h" -#include "UpdateMask.h" #include "World.h" #include "ObjectMgr.h" #include "SpellMgr.h" @@ -42,7 +41,6 @@ #include "Policies/Singleton.h" #include "Totem.h" #include "Creature.h" -#include "Formulas.h" #include "BattleGround/BattleGround.h" #include "OutdoorPvP/OutdoorPvP.h" #include "CreatureAI.h" diff --git a/src/game/WorldHandlers/SpellEffects.cpp b/src/game/WorldHandlers/SpellEffects.cpp index b81016449..27778fe79 100644 --- a/src/game/WorldHandlers/SpellEffects.cpp +++ b/src/game/WorldHandlers/SpellEffects.cpp @@ -27,7 +27,6 @@ #include "WorldPacket.h" #include "Opcodes.h" #include "Log.h" -#include "UpdateMask.h" #include "World.h" #include "ObjectMgr.h" #include "SpellMgr.h" @@ -37,10 +36,7 @@ #include "Spell.h" #include "DynamicObject.h" #include "SpellAuras.h" -#include "Group.h" #include "UpdateData.h" -#include "MapManager.h" -#include "ObjectAccessor.h" #include "SharedDefines.h" #include "Pet.h" #include "GameObject.h" @@ -54,7 +50,6 @@ #include "BattleGround/BattleGroundWS.h" #include "Language.h" #include "SocialMgr.h" -#include "VMapFactory.h" #include "Util.h" #include "TemporarySummon.h" #include "ScriptMgr.h" diff --git a/src/game/WorldHandlers/TaxiHandler.cpp b/src/game/WorldHandlers/TaxiHandler.cpp index 9f7651ac4..d109b923f 100644 --- a/src/game/WorldHandlers/TaxiHandler.cpp +++ b/src/game/WorldHandlers/TaxiHandler.cpp @@ -30,7 +30,6 @@ #include "Log.h" #include "ObjectMgr.h" #include "Player.h" -#include "UpdateMask.h" #include "Path.h" #include "WaypointMovementGenerator.h" diff --git a/src/game/WorldHandlers/TradeHandler.cpp b/src/game/WorldHandlers/TradeHandler.cpp index 337a2c29f..08b68c21d 100644 --- a/src/game/WorldHandlers/TradeHandler.cpp +++ b/src/game/WorldHandlers/TradeHandler.cpp @@ -33,8 +33,8 @@ #include "Item.h" #include "Spell.h" #include "SocialMgr.h" -#include "Language.h" #include "DBCStores.h" +#include "Language.h" void WorldSession::SendTradeStatus(TradeStatus status) { diff --git a/src/game/WorldHandlers/Transports.h b/src/game/WorldHandlers/Transports.h index 88e55a01f..dd945fa40 100644 --- a/src/game/WorldHandlers/Transports.h +++ b/src/game/WorldHandlers/Transports.h @@ -29,7 +29,6 @@ #include #include -#include class Transport : public GameObject { diff --git a/src/game/WorldHandlers/UnitAuraProcHandler.cpp b/src/game/WorldHandlers/UnitAuraProcHandler.cpp index af1ba8dfa..a11af553a 100644 --- a/src/game/WorldHandlers/UnitAuraProcHandler.cpp +++ b/src/game/WorldHandlers/UnitAuraProcHandler.cpp @@ -32,8 +32,7 @@ #include "SpellAuras.h" #include "Totem.h" #include "Creature.h" -#include "Formulas.h" -#include "CreatureAI.h" +#include "ScriptMgr.h" #include "Util.h" pAuraProcHandler AuraProcHandler[TOTAL_AURAS] = diff --git a/src/game/WorldHandlers/WaypointManager.h b/src/game/WorldHandlers/WaypointManager.h index b73727501..c5e945f96 100644 --- a/src/game/WorldHandlers/WaypointManager.h +++ b/src/game/WorldHandlers/WaypointManager.h @@ -26,10 +26,7 @@ #define MANGOS_WAYPOINTMANAGER_H #include "Common.h" -#include -#include #include "Utilities/UnorderedMapSet.h" -#include "Policies/Singleton.h" enum WaypointPathOrigin { diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp index 72e30967c..74659f8ae 100644 --- a/src/game/WorldHandlers/World.cpp +++ b/src/game/WorldHandlers/World.cpp @@ -58,7 +58,6 @@ #include "Policies/Singleton.h" #include "BattleGround/BattleGroundMgr.h" #include "OutdoorPvP/OutdoorPvP.h" -#include "TemporarySummon.h" #include "VMapFactory.h" #include "MoveMap.h" #include "GameEventMgr.h" diff --git a/src/game/WorldHandlers/World.h b/src/game/WorldHandlers/World.h index 8131308c7..6a5c4fdc1 100644 --- a/src/game/WorldHandlers/World.h +++ b/src/game/WorldHandlers/World.h @@ -34,7 +34,6 @@ #include "Policies/Singleton.h" #include "SharedDefines.h" -#include #include #include #include diff --git a/src/game/movement/MoveSplineFlag.h b/src/game/movement/MoveSplineFlag.h index 9f07e0646..753bd2eec 100644 --- a/src/game/movement/MoveSplineFlag.h +++ b/src/game/movement/MoveSplineFlag.h @@ -26,8 +26,6 @@ #define MANGOSSERVER_MOVESPLINEFLAG_H #include "typedefs.h" -#include - namespace Movement { #if defined( __GNUC__ ) diff --git a/src/game/movement/util.cpp b/src/game/movement/util.cpp index f550d146e..727fa9958 100644 --- a/src/game/movement/util.cpp +++ b/src/game/movement/util.cpp @@ -24,7 +24,6 @@ #include "MoveSplineFlag.h" #include -#include namespace Movement { diff --git a/src/game/vmap/BIH.h b/src/game/vmap/BIH.h index fa144ace5..1fb0e8f9b 100644 --- a/src/game/vmap/BIH.h +++ b/src/game/vmap/BIH.h @@ -25,18 +25,17 @@ #ifndef MANGOS_H_BIH #define MANGOS_H_BIH -#include -#include -#include - -#include - #include #include #include -#include #include +#include + +#include +#include +#include + #define MAX_STACK_SIZE 64 #ifdef _MSC_VER diff --git a/src/game/vmap/GameObjectModel.cpp b/src/game/vmap/GameObjectModel.cpp index e9ba34503..617591703 100644 --- a/src/game/vmap/GameObjectModel.cpp +++ b/src/game/vmap/GameObjectModel.cpp @@ -31,7 +31,6 @@ #include "World.h" #include "GameObjectModel.h" #include "DBCStores.h" -#include "Creature.h" struct GameobjectModelData { diff --git a/src/game/vmap/IVMapManager.h b/src/game/vmap/IVMapManager.h index dc7b5f383..38a850a9c 100644 --- a/src/game/vmap/IVMapManager.h +++ b/src/game/vmap/IVMapManager.h @@ -25,7 +25,7 @@ #ifndef MANGOS_H_IVMAPMANAGER #define MANGOS_H_IVMAPMANAGER -#include +#include #include //=========================================================== diff --git a/src/game/vmap/RegularGrid.h b/src/game/vmap/RegularGrid.h index 6a440ca37..798e19163 100644 --- a/src/game/vmap/RegularGrid.h +++ b/src/game/vmap/RegularGrid.h @@ -28,7 +28,6 @@ #include #include #include -#include #include #include "Errors.h" diff --git a/src/game/vmap/TileAssembler.cpp b/src/game/vmap/TileAssembler.cpp index a94cefdfe..fc7c5561d 100644 --- a/src/game/vmap/TileAssembler.cpp +++ b/src/game/vmap/TileAssembler.cpp @@ -22,15 +22,15 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ +#include +#include +#include + #include "TileAssembler.h" #include "MapTree.h" #include "BIH.h" #include "VMapDefinitions.h" -#include -#include -#include -#include using G3D::Vector3; using G3D::AABox; diff --git a/src/game/vmap/VMapDefinitions.h b/src/game/vmap/VMapDefinitions.h index 9e774f05e..19c3f336f 100644 --- a/src/game/vmap/VMapDefinitions.h +++ b/src/game/vmap/VMapDefinitions.h @@ -25,8 +25,6 @@ #ifndef MANGOS_H_VMAPDEFINITIONS #define MANGOS_H_VMAPDEFINITIONS -#include - #define LIQUID_TILE_SIZE (533.333f / 128.f) namespace VMAP diff --git a/src/game/vmap/VMapFactory.cpp b/src/game/vmap/VMapFactory.cpp index 9d1b9343e..bc1caeedd 100644 --- a/src/game/vmap/VMapFactory.cpp +++ b/src/game/vmap/VMapFactory.cpp @@ -22,7 +22,6 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ -#include #include "VMapFactory.h" #include "VMapManager2.h" diff --git a/src/game/vmap/VMapManager2.cpp b/src/game/vmap/VMapManager2.cpp index 6981f916e..44f325bb9 100644 --- a/src/game/vmap/VMapManager2.cpp +++ b/src/game/vmap/VMapManager2.cpp @@ -22,7 +22,6 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ -#include #include #include #include diff --git a/src/game/vmap/WorldModel.h b/src/game/vmap/WorldModel.h index e2ffa8306..91234bc0d 100644 --- a/src/game/vmap/WorldModel.h +++ b/src/game/vmap/WorldModel.h @@ -25,7 +25,8 @@ #ifndef MANGOS_H_WORLDMODEL #define MANGOS_H_WORLDMODEL -#include +#include "Platform/Define.h" + #include #include #include