From e90d7a2f9246107e066eda45175c933c5ad0d1e5 Mon Sep 17 00:00:00 2001 From: Winfidonarleyan Date: Sat, 18 Nov 2023 23:51:26 +0700 Subject: [PATCH] chore(Core/Misc): sort includes (#17776) * chore(Cleanup): sort includes * fix build * fix build again --- src/common/Collision/Maps/TileAssembler.cpp | 2 +- src/common/Dynamic/ObjectRegistry.h | 2 +- src/common/Logging/enuminfo_LogCommon.cpp | 2 +- src/server/apps/authserver/Server/AuthSession.cpp | 2 +- .../apps/worldserver/RemoteAccess/RASession.cpp | 2 +- src/server/database/Database/DatabaseWorkerPool.cpp | 2 +- src/server/game/AI/CreatureAI.cpp | 4 ++-- src/server/game/AI/CreatureAIRegistry.cpp | 2 +- src/server/game/AI/CreatureAISelector.cpp | 2 +- src/server/game/AI/CreatureAISelector.h | 3 +++ src/server/game/AI/GameObjectAIFactory.h | 3 ++- src/server/game/AI/ScriptedAI/ScriptedCreature.h | 2 +- src/server/game/Addons/AddonMgr.cpp | 2 +- src/server/game/Autobroadcast/AutobroadcastMgr.cpp | 4 ++-- src/server/game/Battlegrounds/Arena.cpp | 4 ++-- src/server/game/Battlegrounds/BattlegroundMgr.h | 2 +- src/server/game/Battlegrounds/Zones/BattlegroundEY.h | 2 +- src/server/game/Chat/Channels/ChannelMgr.cpp | 4 ++-- src/server/game/Conditions/ConditionMgr.cpp | 2 +- src/server/game/Conditions/DisableMgr.cpp | 4 ++-- src/server/game/DataStores/M2Stores.cpp | 4 ++-- src/server/game/DataStores/M2Structure.h | 2 +- src/server/game/Entities/Creature/GossipDef.cpp | 2 +- .../game/Entities/DynamicObject/DynamicObject.cpp | 2 +- src/server/game/Entities/GameObject/GameObject.h | 2 +- src/server/game/Entities/Item/Item.cpp | 4 ++-- src/server/game/Entities/Item/enuminfo_Item.cpp | 2 +- src/server/game/Entities/Object/Object.cpp | 4 ++-- src/server/game/Entities/Object/Position.cpp | 2 +- src/server/game/Entities/Object/Position.h | 2 +- src/server/game/Entities/Player/Player.cpp | 4 ++-- src/server/game/Entities/Player/Player.h | 2 +- src/server/game/Entities/Player/PlayerStorage.cpp | 4 ++-- src/server/game/Entities/Player/PlayerTaxi.cpp | 2 +- src/server/game/Entities/Unit/StatSystem.cpp | 2 +- src/server/game/Entities/Unit/Unit.cpp | 4 ++-- src/server/game/Entities/Unit/Unit.h | 2 +- src/server/game/Entities/Unit/enuminfo_Unit.cpp | 2 +- src/server/game/Globals/ObjectMgr.cpp | 10 +++++----- src/server/game/Globals/ObjectMgr.h | 2 +- src/server/game/Grids/ObjectGridLoader.cpp | 2 +- src/server/game/Groups/Group.h | 2 +- src/server/game/Handlers/CharacterHandler.cpp | 2 +- src/server/game/Handlers/CombatHandler.cpp | 2 +- src/server/game/Handlers/GroupHandler.cpp | 2 +- src/server/game/Maps/MapUpdater.cpp | 2 +- src/server/game/Motd/MotdMgr.cpp | 2 +- src/server/game/Movement/MotionMaster.cpp | 2 +- src/server/game/Quests/enuminfo_QuestDef.cpp | 2 +- src/server/game/Server/Packets/AllPackets.h | 4 ++-- src/server/game/Server/Packets/CombatPackets.h | 2 +- src/server/game/Server/Packets/MiscPackets.h | 2 +- src/server/game/Server/Packets/PetPackets.h | 2 +- src/server/game/Spells/SpellInfoCorrections.cpp | 2 +- src/server/game/Spells/SpellMgr.cpp | 2 +- src/server/game/Tools/PlayerDump.h | 4 ++-- src/server/game/Warden/WardenPayloadMgr.cpp | 2 +- src/server/game/Warden/enuminfo_WardenCheckMgr.cpp | 2 +- src/server/game/World/World.cpp | 4 ++-- src/server/scripts/Commands/cs_debug.cpp | 2 +- src/server/scripts/Commands/cs_server.cpp | 2 +- .../BlackrockMountain/BlackrockSpire/boss_gyth.cpp | 2 +- .../BlackwingLair/boss_broodlord_lashlayer.cpp | 2 +- .../BlackwingLair/boss_nefarian.cpp | 2 +- .../EasternKingdoms/Karazhan/boss_chess_event.cpp | 4 ++-- .../EasternKingdoms/Karazhan/boss_netherspite.cpp | 2 +- .../EasternKingdoms/Karazhan/boss_shade_of_aran.cpp | 2 +- .../EasternKingdoms/Karazhan/bosses_opera.cpp | 2 +- .../scripts/EasternKingdoms/Karazhan/karazhan.cpp | 2 +- .../MagistersTerrace/instance_magisters_terrace.cpp | 2 +- .../EasternKingdoms/ScarletEnclave/chapter1.cpp | 2 +- .../ShadowfangKeep/boss_apothecary_hummel.cpp | 12 ++++++------ .../EasternKingdoms/ShadowfangKeep/shadowfang_keep.h | 2 +- .../SunkenTemple/instance_sunken_temple.cpp | 2 +- .../EasternKingdoms/ZulGurub/boss_mandokir.cpp | 4 ++-- .../scripts/EasternKingdoms/ZulGurub/boss_marli.cpp | 2 +- .../scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp | 2 +- .../TheBlackMorass/the_black_morass.cpp | 2 +- .../Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp | 2 +- .../scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp | 2 +- .../Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp | 2 +- .../Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp | 2 +- .../Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp | 2 +- .../Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp | 2 +- src/server/scripts/Kalimdor/boss_azuregos.cpp | 4 ++-- .../scripts/Northrend/Ulduar/Ulduar/ulduar.cpp | 2 +- .../UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp | 2 +- src/server/scripts/Northrend/zone_dragonblight.cpp | 2 +- src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp | 2 +- .../SerpentShrine/boss_fathomlord_karathress.cpp | 2 +- .../SerpentShrine/boss_leotheras_the_blind.cpp | 2 +- .../SteamVault/boss_warlord_kalithresh.cpp | 2 +- src/server/scripts/Outland/GruulsLair/boss_gruul.cpp | 2 +- src/server/scripts/Outland/zone_netherstorm.cpp | 2 +- src/server/scripts/Spells/spell_item.cpp | 2 +- src/server/scripts/World/chat_log.cpp | 2 +- src/server/scripts/World/server_mail.cpp | 4 ++-- src/server/shared/enuminfo_SharedDefines.cpp | 2 +- src/test/mocks/WorldMock.h | 2 +- src/tools/mmaps_generator/PathGenerator.cpp | 2 +- src/tools/vmap4_extractor/mpq_libmpq.cpp | 2 +- 101 files changed, 131 insertions(+), 127 deletions(-) diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index c34fa3828..b86d83419 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -20,10 +20,10 @@ #include "MapDefines.h" #include "MapTree.h" #include "VMapDefinitions.h" +#include #include #include #include -#include using G3D::Vector3; using G3D::AABox; diff --git a/src/common/Dynamic/ObjectRegistry.h b/src/common/Dynamic/ObjectRegistry.h index ba9bccd39..fe8c64dd7 100644 --- a/src/common/Dynamic/ObjectRegistry.h +++ b/src/common/Dynamic/ObjectRegistry.h @@ -20,10 +20,10 @@ #include "Define.h" #include +#include #include #include #include -#include /** ObjectRegistry holds all registry item of the same type */ diff --git a/src/common/Logging/enuminfo_LogCommon.cpp b/src/common/Logging/enuminfo_LogCommon.cpp index 2e4265563..e1750cb3f 100644 --- a/src/common/Logging/enuminfo_LogCommon.cpp +++ b/src/common/Logging/enuminfo_LogCommon.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "LogCommon.h" #include "Define.h" +#include "LogCommon.h" #include "SmartEnum.h" #include diff --git a/src/server/apps/authserver/Server/AuthSession.cpp b/src/server/apps/authserver/Server/AuthSession.cpp index b2ae2cab3..bf98ab313 100644 --- a/src/server/apps/authserver/Server/AuthSession.cpp +++ b/src/server/apps/authserver/Server/AuthSession.cpp @@ -28,10 +28,10 @@ #include "Log.h" #include "RealmList.h" #include "SecretMgr.h" +#include "StringConvert.h" #include "TOTP.h" #include "Timer.h" #include "Util.h" -#include "StringConvert.h" #include #include diff --git a/src/server/apps/worldserver/RemoteAccess/RASession.cpp b/src/server/apps/worldserver/RemoteAccess/RASession.cpp index 42f14621d..d1cf74e93 100644 --- a/src/server/apps/worldserver/RemoteAccess/RASession.cpp +++ b/src/server/apps/worldserver/RemoteAccess/RASession.cpp @@ -21,8 +21,8 @@ #include "DatabaseEnv.h" #include "Duration.h" #include "Log.h" -#include "SRP6.h" #include "MotdMgr.h" +#include "SRP6.h" #include "Util.h" #include "World.h" #include diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp index 4e0f466cf..0273846e1 100644 --- a/src/server/database/Database/DatabaseWorkerPool.cpp +++ b/src/server/database/Database/DatabaseWorkerPool.cpp @@ -31,8 +31,8 @@ #include "SQLOperation.h" #include "Transaction.h" #include "WorldDatabase.h" -#include #include +#include #ifdef ACORE_DEBUG #include diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 04e63bc89..e85a674d0 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "AreaBoundary.h" #include "CreatureAI.h" +#include "AreaBoundary.h" #include "Creature.h" #include "CreatureAIImpl.h" #include "CreatureGroups.h" @@ -24,8 +24,8 @@ #include "Log.h" #include "MapReference.h" #include "Player.h" -#include "Vehicle.h" #include "ScriptMgr.h" +#include "Vehicle.h" #include "ZoneScript.h" //Disable CreatureAI when charmed diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp index 4e1f6fdc5..198292494 100644 --- a/src/server/game/AI/CreatureAIRegistry.cpp +++ b/src/server/game/AI/CreatureAIRegistry.cpp @@ -18,6 +18,7 @@ #include "CreatureAIRegistry.h" #include "CombatAI.h" #include "CreatureAIFactory.h" +#include "GameObjectAIFactory.h" #include "GuardAI.h" #include "MovementGenerator.h" #include "PassiveAI.h" @@ -27,7 +28,6 @@ #include "SmartAI.h" #include "TotemAI.h" #include "WaypointMovementGenerator.h" -#include "GameObjectAIFactory.h" namespace AIRegistry { diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp index 96861c484..2a80bf53f 100644 --- a/src/server/game/AI/CreatureAISelector.cpp +++ b/src/server/game/AI/CreatureAISelector.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "Creature.h" #include "CreatureAISelector.h" +#include "Creature.h" #include "CreatureAIFactory.h" #include "MovementGenerator.h" diff --git a/src/server/game/AI/CreatureAISelector.h b/src/server/game/AI/CreatureAISelector.h index a5df78f81..58b6a4978 100644 --- a/src/server/game/AI/CreatureAISelector.h +++ b/src/server/game/AI/CreatureAISelector.h @@ -18,6 +18,8 @@ #ifndef ACORE_CREATUREAISELECTOR_H #define ACORE_CREATUREAISELECTOR_H +#include "Define.h" + class CreatureAI; class Creature; class MovementGenerator; @@ -31,4 +33,5 @@ namespace FactorySelector AC_GAME_API MovementGenerator* SelectMovementGenerator(Unit* unit); AC_GAME_API GameObjectAI* SelectGameObjectAI(GameObject* go); } + #endif diff --git a/src/server/game/AI/GameObjectAIFactory.h b/src/server/game/AI/GameObjectAIFactory.h index bfebd358b..3bc101b7c 100644 --- a/src/server/game/AI/GameObjectAIFactory.h +++ b/src/server/game/AI/GameObjectAIFactory.h @@ -18,8 +18,9 @@ #ifndef ACORE_GAMEOBJECTAIFACTORY_H #define ACORE_GAMEOBJECTAIFACTORY_H -#include "ObjectRegistry.h" #include "FactoryHolder.h" +#include "GameObjectAI.h" +#include "ObjectRegistry.h" typedef FactoryHolder GameObjectAICreator; diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index 07ed2c45e..77735c464 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -21,8 +21,8 @@ #include "Creature.h" #include "CreatureAI.h" #include "CreatureAIImpl.h" -#include "InstanceScript.h" #include "EventMap.h" +#include "InstanceScript.h" #include "TaskScheduler.h" #define CAST_AI(a, b) (dynamic_cast(b)) diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp index 918b1b517..cce10efe9 100644 --- a/src/server/game/Addons/AddonMgr.cpp +++ b/src/server/game/Addons/AddonMgr.cpp @@ -16,8 +16,8 @@ */ #include "AddonMgr.h" -#include "DatabaseEnv.h" #include "CryptoHash.h" +#include "DatabaseEnv.h" #include "Log.h" #include "Timer.h" #include diff --git a/src/server/game/Autobroadcast/AutobroadcastMgr.cpp b/src/server/game/Autobroadcast/AutobroadcastMgr.cpp index 846f8cb54..a0d00dd81 100644 --- a/src/server/game/Autobroadcast/AutobroadcastMgr.cpp +++ b/src/server/game/Autobroadcast/AutobroadcastMgr.cpp @@ -16,10 +16,10 @@ */ #include "AutobroadcastMgr.h" -#include "Config.h" #include "Chat.h" -#include "Player.h" +#include "Config.h" #include "GridNotifiers.h" +#include "Player.h" AutobroadcastMgr* AutobroadcastMgr::instance() { diff --git a/src/server/game/Battlegrounds/Arena.cpp b/src/server/game/Battlegrounds/Arena.cpp index 1c4a873d5..1c58679fb 100644 --- a/src/server/game/Battlegrounds/Arena.cpp +++ b/src/server/game/Battlegrounds/Arena.cpp @@ -20,11 +20,11 @@ #include "GroupMgr.h" #include "Log.h" #include "ObjectAccessor.h" +#include "Pet.h" #include "Player.h" +#include "ScriptMgr.h" #include "World.h" #include "WorldSession.h" -#include "Pet.h" -#include "ScriptMgr.h" //#include "WorldStatePackets.h" void ArenaScore::AppendToPacket(WorldPacket& data) diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h index bdb17651a..27a702a06 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.h +++ b/src/server/game/Battlegrounds/BattlegroundMgr.h @@ -23,8 +23,8 @@ #include "Common.h" #include "CreatureAIImpl.h" #include "DBCEnums.h" -#include #include +#include typedef std::map BattlegroundContainer; typedef std::set BattlegroundClientIdsContainer; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index 4e364df5b..a20132c0b 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -20,8 +20,8 @@ #include "Battleground.h" #include "BattlegroundScore.h" -#include "Language.h" #include "EventMap.h" +#include "Language.h" enum BG_EY_Events { diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp index 0e74a451a..9716d8898 100644 --- a/src/server/game/Chat/Channels/ChannelMgr.cpp +++ b/src/server/game/Chat/Channels/ChannelMgr.cpp @@ -18,9 +18,9 @@ #include "ChannelMgr.h" #include "Log.h" #include "Player.h" -#include "World.h" -#include "Tokenize.h" #include "StringConvert.h" +#include "Tokenize.h" +#include "World.h" ChannelMgr::~ChannelMgr() { diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 62751edba..8b98e0b8b 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -20,8 +20,8 @@ #include "GameEventMgr.h" #include "InstanceScript.h" #include "ObjectMgr.h" -#include "Player.h" #include "Pet.h" +#include "Player.h" #include "ReputationMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 1f745391d..b26272e32 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -23,9 +23,9 @@ #include "Player.h" #include "SpellInfo.h" #include "SpellMgr.h" -#include "World.h" -#include "Tokenize.h" #include "StringConvert.h" +#include "Tokenize.h" +#include "World.h" namespace DisableMgr { diff --git a/src/server/game/DataStores/M2Stores.cpp b/src/server/game/DataStores/M2Stores.cpp index 3bd101bd8..157ae9b2a 100644 --- a/src/server/game/DataStores/M2Stores.cpp +++ b/src/server/game/DataStores/M2Stores.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "DBCStores.h" +#include "M2Stores.h" #include "Containers.h" +#include "DBCStores.h" #include "Log.h" #include "M2Structure.h" -#include "M2Stores.h" #include "World.h" #include #include diff --git a/src/server/game/DataStores/M2Structure.h b/src/server/game/DataStores/M2Structure.h index a3316c711..520cd50bf 100644 --- a/src/server/game/DataStores/M2Structure.h +++ b/src/server/game/DataStores/M2Structure.h @@ -18,8 +18,8 @@ #ifndef ACORE_M2STRUCTURE_H #define ACORE_M2STRUCTURE_H -#include #include +#include // Structures for M2 file. Source: https://wowdev.wiki #pragma pack(push, 1) diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index 102cd4d50..393627795 100644 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -17,8 +17,8 @@ #include "GossipDef.h" #include "Formulas.h" -#include "ObjectMgr.h" #include "Object.h" +#include "ObjectMgr.h" #include "Opcodes.h" #include "Player.h" #include "QuestDef.h" diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp index 779e44312..feb9d7cff 100644 --- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp +++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ -#include "SpellAuraEffects.h" #include "GameTime.h" #include "GridNotifiers.h" #include "ObjectAccessor.h" #include "Opcodes.h" #include "ScriptMgr.h" +#include "SpellAuraEffects.h" #include "Transport.h" #include "UpdateMask.h" #include "World.h" diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 61962e75d..d7ba58e8f 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -21,10 +21,10 @@ #include "Common.h" #include "DatabaseEnv.h" #include "G3D/Quat.h" +#include "GameObjectData.h" #include "LootMgr.h" #include "Object.h" #include "SharedDefines.h" -#include "GameObjectData.h" #include "Unit.h" #include diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index b63e90b86..9311e9202 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -26,9 +26,9 @@ #include "ScriptMgr.h" #include "SpellInfo.h" #include "SpellMgr.h" -#include "WorldPacket.h" -#include "Tokenize.h" #include "StringConvert.h" +#include "Tokenize.h" +#include "WorldPacket.h" void AddItemsSetItem(Player* player, Item* item) { diff --git a/src/server/game/Entities/Item/enuminfo_Item.cpp b/src/server/game/Entities/Item/enuminfo_Item.cpp index a7b1ecc35..d43ff6470 100644 --- a/src/server/game/Entities/Item/enuminfo_Item.cpp +++ b/src/server/game/Entities/Item/enuminfo_Item.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "Item.h" #include "Define.h" +#include "Item.h" #include "SmartEnum.h" #include diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index fef69d6ef..fcd748008 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -38,8 +38,10 @@ #include "ScriptMgr.h" #include "SharedDefines.h" #include "SpellAuraEffects.h" +#include "StringConvert.h" #include "TargetedMovementGenerator.h" #include "TemporarySummon.h" +#include "Tokenize.h" #include "Totem.h" #include "Transport.h" #include "UpdateData.h" @@ -49,8 +51,6 @@ #include "Vehicle.h" #include "World.h" #include "WorldPacket.h" -#include "Tokenize.h" -#include "StringConvert.h" /// @todo: this import is not necessary for compilation and marked as unused by the IDE // however, for some reasons removing it would cause a damn linking issue diff --git a/src/server/game/Entities/Object/Position.cpp b/src/server/game/Entities/Object/Position.cpp index 90302ac4c..b8dc69f9f 100644 --- a/src/server/game/Entities/Object/Position.cpp +++ b/src/server/game/Entities/Object/Position.cpp @@ -17,8 +17,8 @@ #include "Position.h" #include "ByteBuffer.h" -#include "GridDefines.h" #include "Geometry.h" +#include "GridDefines.h" #include #include diff --git a/src/server/game/Entities/Object/Position.h b/src/server/game/Entities/Object/Position.h index e88e3ea2e..69ff77a3a 100644 --- a/src/server/game/Entities/Object/Position.h +++ b/src/server/game/Entities/Object/Position.h @@ -18,9 +18,9 @@ #ifndef ACore_game_Position_h__ #define ACore_game_Position_h__ -#include #include "Common.h" #include "G3D/Vector3.h" +#include class ByteBuffer; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index ce39c9e7f..293f47898 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -75,7 +75,9 @@ #include "SpellAuraEffects.h" #include "SpellAuras.h" #include "SpellMgr.h" +#include "StringConvert.h" #include "TicketMgr.h" +#include "Tokenize.h" #include "Transport.h" #include "UpdateData.h" #include "UpdateFieldFlags.h" @@ -85,8 +87,6 @@ #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Tokenize.h" -#include "StringConvert.h" /// @todo: this import is not necessary for compilation and marked as unused by the IDE // however, for some reasons removing it would cause a damn linking issue diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 18300e2db..e5606b037 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -37,8 +37,8 @@ #include "PlayerTaxi.h" #include "QuestDef.h" #include "SpellAuras.h" -#include "SpellMgr.h" #include "SpellInfo.h" +#include "SpellMgr.h" #include "TradeData.h" #include "Unit.h" #include "WorldSession.h" diff --git a/src/server/game/Entities/Player/PlayerStorage.cpp b/src/server/game/Entities/Player/PlayerStorage.cpp index f4aede788..1aacad7b7 100644 --- a/src/server/game/Entities/Player/PlayerStorage.cpp +++ b/src/server/game/Entities/Player/PlayerStorage.cpp @@ -62,6 +62,8 @@ #include "SpellAuraEffects.h" #include "SpellAuras.h" #include "SpellMgr.h" +#include "StringConvert.h" +#include "Tokenize.h" #include "Transport.h" #include "UpdateData.h" #include "UpdateFieldFlags.h" @@ -70,8 +72,6 @@ #include "Weather.h" #include "World.h" #include "WorldPacket.h" -#include "Tokenize.h" -#include "StringConvert.h" /// @todo: this import is not necessary for compilation and marked as unused by the IDE // however, for some reasons removing it would cause a damn linking issue diff --git a/src/server/game/Entities/Player/PlayerTaxi.cpp b/src/server/game/Entities/Player/PlayerTaxi.cpp index 680af2e28..36fda1f9c 100644 --- a/src/server/game/Entities/Player/PlayerTaxi.cpp +++ b/src/server/game/Entities/Player/PlayerTaxi.cpp @@ -17,8 +17,8 @@ #include "ObjectMgr.h" #include "Player.h" -#include "Tokenize.h" #include "StringConvert.h" +#include "Tokenize.h" void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level) { diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index e9eb7e0b1..5e23e2142 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "Creature.h" #include "Config.h" +#include "Creature.h" #include "Pet.h" #include "Player.h" #include "ScriptMgr.h" diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 93e901ca2..eb870e8fc 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -58,8 +58,10 @@ #include "SpellAuras.h" #include "SpellInfo.h" #include "SpellMgr.h" +#include "StringConvert.h" #include "TargetedMovementGenerator.h" #include "TemporarySummon.h" +#include "Tokenize.h" #include "Totem.h" #include "TotemAI.h" #include "Transport.h" @@ -68,8 +70,6 @@ #include "Vehicle.h" #include "World.h" #include "WorldPacket.h" -#include "Tokenize.h" -#include "StringConvert.h" #include float baseMoveSpeed[MAX_MOVE_TYPE] = diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 28200fc5a..d26069725 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -18,8 +18,8 @@ #ifndef __UNIT_H #define __UNIT_H -#include "EventProcessor.h" #include "EnumFlag.h" +#include "EventProcessor.h" #include "FollowerRefMgr.h" #include "FollowerReference.h" #include "HostileRefMgr.h" diff --git a/src/server/game/Entities/Unit/enuminfo_Unit.cpp b/src/server/game/Entities/Unit/enuminfo_Unit.cpp index a3c4938c6..bd16ebd35 100644 --- a/src/server/game/Entities/Unit/enuminfo_Unit.cpp +++ b/src/server/game/Entities/Unit/enuminfo_Unit.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "Unit.h" #include "Define.h" #include "SmartEnum.h" +#include "Unit.h" #include namespace Acore::Impl::EnumUtilsImpl diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index de26f39fa..5f65eb4a2 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -22,14 +22,14 @@ #include "CharacterCache.h" #include "Chat.h" #include "Common.h" -#include "CreatureAIFactory.h" #include "Config.h" #include "Containers.h" -#include "DatabaseEnv.h" +#include "CreatureAIFactory.h" #include "DBCStructure.h" +#include "DatabaseEnv.h" #include "DisableMgr.h" -#include "GameObjectAIFactory.h" #include "GameEventMgr.h" +#include "GameObjectAIFactory.h" #include "GameTime.h" #include "GossipDef.h" #include "GroupMgr.h" @@ -45,13 +45,13 @@ #include "Spell.h" #include "SpellMgr.h" #include "SpellScript.h" +#include "StringConvert.h" +#include "Tokenize.h" #include "Transport.h" #include "Unit.h" #include "Util.h" #include "Vehicle.h" #include "World.h" -#include "StringConvert.h" -#include "Tokenize.h" #include ScriptMapMap sSpellScripts; diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 33ef56adf..7a0cd851d 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -25,6 +25,7 @@ #include "DatabaseEnv.h" #include "DynamicObject.h" #include "GameObject.h" +#include "GossipDef.h" #include "ItemTemplate.h" #include "Log.h" #include "Mail.h" @@ -36,7 +37,6 @@ #include "QuestDef.h" #include "TemporarySummon.h" #include "VehicleDefines.h" -#include "GossipDef.h" #include #include #include diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 628189ae4..2c92ef675 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -18,10 +18,10 @@ #include "ObjectGridLoader.h" #include "CellImpl.h" #include "Corpse.h" -#include "GridNotifiers.h" #include "Creature.h" #include "DynamicObject.h" #include "GameObject.h" +#include "GridNotifiers.h" #include "ObjectMgr.h" #include "Transport.h" #include "Vehicle.h" diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 50775eb5d..b508d1edc 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -18,8 +18,8 @@ #ifndef AZEROTHCORE_GROUP_H #define AZEROTHCORE_GROUP_H -#include "DataMap.h" #include "DBCEnums.h" +#include "DataMap.h" #include "GroupRefMgr.h" #include "LootMgr.h" #include "QueryResult.h" diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 1fd7d6a35..2aba36241 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -35,6 +35,7 @@ #include "Log.h" #include "MapMgr.h" #include "Metric.h" +#include "MotdMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -45,7 +46,6 @@ #include "Realm.h" #include "ReputationMgr.h" #include "ScriptMgr.h" -#include "MotdMgr.h" #include "SharedDefines.h" #include "SocialMgr.h" #include "SpellAuraEffects.h" diff --git a/src/server/game/Handlers/CombatHandler.cpp b/src/server/game/Handlers/CombatHandler.cpp index b3d84d5ec..0150c83e4 100644 --- a/src/server/game/Handlers/CombatHandler.cpp +++ b/src/server/game/Handlers/CombatHandler.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "CreatureAI.h" #include "CombatPackets.h" +#include "CreatureAI.h" #include "Log.h" #include "ObjectAccessor.h" #include "ObjectDefines.h" diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index d8d718619..2e4f9f063 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -20,9 +20,9 @@ #include "GroupMgr.h" #include "Language.h" #include "Log.h" +#include "MiscPackets.h" #include "ObjectMgr.h" #include "Opcodes.h" -#include "MiscPackets.h" #include "Pet.h" #include "Player.h" #include "ScriptMgr.h" diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp index 164c70d85..952ee8751 100644 --- a/src/server/game/Maps/MapUpdater.cpp +++ b/src/server/game/Maps/MapUpdater.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "MapUpdater.h" #include "DatabaseEnv.h" #include "LFGMgr.h" #include "Map.h" -#include "MapUpdater.h" #include "Metric.h" class UpdateRequest diff --git a/src/server/game/Motd/MotdMgr.cpp b/src/server/game/Motd/MotdMgr.cpp index b79be4965..5b39fc6bc 100644 --- a/src/server/game/Motd/MotdMgr.cpp +++ b/src/server/game/Motd/MotdMgr.cpp @@ -19,9 +19,9 @@ #include "Config.h" #include "Opcodes.h" #include "ScriptMgr.h" +#include "Tokenize.h" #include "Util.h" #include "WorldPacket.h" -#include "Tokenize.h" #include namespace diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index a9dd3207c..ff3c9d246 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -30,8 +30,8 @@ #include "PointMovementGenerator.h" #include "RandomMovementGenerator.h" #include "TargetedMovementGenerator.h" -#include "WaypointMovementGenerator.h" #include "WaypointMgr.h" +#include "WaypointMovementGenerator.h" inline MovementGenerator* GetIdleMovementGenerator() { diff --git a/src/server/game/Quests/enuminfo_QuestDef.cpp b/src/server/game/Quests/enuminfo_QuestDef.cpp index aec7b5de3..cf4651adc 100644 --- a/src/server/game/Quests/enuminfo_QuestDef.cpp +++ b/src/server/game/Quests/enuminfo_QuestDef.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "QuestDef.h" #include "Define.h" +#include "QuestDef.h" #include "SmartEnum.h" #include diff --git a/src/server/game/Server/Packets/AllPackets.h b/src/server/game/Server/Packets/AllPackets.h index 012400299..1e3457e1d 100644 --- a/src/server/game/Server/Packets/AllPackets.h +++ b/src/server/game/Server/Packets/AllPackets.h @@ -18,15 +18,15 @@ #ifndef AllPackets_h__ #define AllPackets_h__ -#include "LFGPackets.h" #include "BankPackets.h" #include "CharacterPackets.h" #include "ChatPackets.h" -#include "PetPackets.h" #include "CombatLogPackets.h" #include "CombatPackets.h" #include "GuildPackets.h" +#include "LFGPackets.h" #include "MiscPackets.h" +#include "PetPackets.h" #include "TotemPackets.h" #include "WorldStatePackets.h" diff --git a/src/server/game/Server/Packets/CombatPackets.h b/src/server/game/Server/Packets/CombatPackets.h index 7c221d8e7..1126d907d 100644 --- a/src/server/game/Server/Packets/CombatPackets.h +++ b/src/server/game/Server/Packets/CombatPackets.h @@ -18,8 +18,8 @@ #ifndef CombatPackets_h__ #define CombatPackets_h__ -#include "Packet.h" #include "ObjectGuid.h" +#include "Packet.h" namespace WorldPackets { diff --git a/src/server/game/Server/Packets/MiscPackets.h b/src/server/game/Server/Packets/MiscPackets.h index 52c45ba63..6f991293f 100644 --- a/src/server/game/Server/Packets/MiscPackets.h +++ b/src/server/game/Server/Packets/MiscPackets.h @@ -18,8 +18,8 @@ #ifndef MiscPackets_h__ #define MiscPackets_h__ -#include "Packet.h" #include "ObjectGuid.h" +#include "Packet.h" #include "Weather.h" enum WeatherState : uint32; diff --git a/src/server/game/Server/Packets/PetPackets.h b/src/server/game/Server/Packets/PetPackets.h index ccc1bb4d1..cbb96db70 100644 --- a/src/server/game/Server/Packets/PetPackets.h +++ b/src/server/game/Server/Packets/PetPackets.h @@ -18,8 +18,8 @@ #ifndef PetPackets_h__ #define PetPackets_h__ -#include "Packet.h" #include "ObjectGuid.h" +#include "Packet.h" namespace WorldPackets { diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index a142b8f01..be021c5c6 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "SpellInfo.h" #include "DBCStores.h" #include "DBCStructure.h" #include "GameGraveyard.h" +#include "SpellInfo.h" #include "SpellMgr.h" inline void ApplySpellFix(std::initializer_list spellIds, void(*fix)(SpellInfo*)) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index ba013ce6e..84b3e50f2 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -26,12 +26,12 @@ #include "MapMgr.h" #include "ObjectMgr.h" #include "Player.h" +#include "ScriptMgr.h" #include "SharedDefines.h" #include "Spell.h" #include "SpellAuraDefines.h" #include "SpellAuras.h" #include "SpellInfo.h" -#include "ScriptMgr.h" #include "World.h" bool IsPrimaryProfessionSkill(uint32 skill) diff --git a/src/server/game/Tools/PlayerDump.h b/src/server/game/Tools/PlayerDump.h index 493b6da85..209ac5742 100644 --- a/src/server/game/Tools/PlayerDump.h +++ b/src/server/game/Tools/PlayerDump.h @@ -18,11 +18,11 @@ #ifndef _PLAYER_DUMP_H #define _PLAYER_DUMP_H -#include +#include "ObjectGuid.h" #include #include #include -#include "ObjectGuid.h" +#include enum DumpTableType { diff --git a/src/server/game/Warden/WardenPayloadMgr.cpp b/src/server/game/Warden/WardenPayloadMgr.cpp index dcb363dba..9245bd9e5 100644 --- a/src/server/game/Warden/WardenPayloadMgr.cpp +++ b/src/server/game/Warden/WardenPayloadMgr.cpp @@ -16,9 +16,9 @@ */ #include "WardenPayloadMgr.h" -#include "StringFormat.h" #include "Errors.h" #include "Log.h" +#include "StringFormat.h" WardenPayloadMgr::WardenPayloadMgr() { } diff --git a/src/server/game/Warden/enuminfo_WardenCheckMgr.cpp b/src/server/game/Warden/enuminfo_WardenCheckMgr.cpp index f76872a82..f4d906b69 100644 --- a/src/server/game/Warden/enuminfo_WardenCheckMgr.cpp +++ b/src/server/game/Warden/enuminfo_WardenCheckMgr.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "WardenCheckMgr.h" #include "Define.h" #include "SmartEnum.h" +#include "WardenCheckMgr.h" #include namespace Acore::Impl::EnumUtilsImpl diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 9c5a1bc13..c1e6feec4 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -59,10 +59,11 @@ #include "Log.h" #include "LootItemStorage.h" #include "LootMgr.h" +#include "M2Stores.h" #include "MMapFactory.h" #include "MapMgr.h" #include "Metric.h" -#include "M2Stores.h" +#include "MotdMgr.h" #include "ObjectMgr.h" #include "Opcodes.h" #include "OutdoorPvPMgr.h" @@ -72,7 +73,6 @@ #include "PoolMgr.h" #include "Realm.h" #include "ScriptMgr.h" -#include "MotdMgr.h" #include "SkillDiscovery.h" #include "SkillExtraItems.h" #include "SmartAI.h" diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 8572103d5..f6147ab45 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -31,8 +31,8 @@ #include "GridNotifiersImpl.h" #include "Language.h" #include "Log.h" -#include "MapMgr.h" #include "M2Stores.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "PoolMgr.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index 122e2d6da..fe76fb503 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -28,11 +28,11 @@ #include "GitRevision.h" #include "Language.h" #include "ModuleMgr.h" +#include "MotdMgr.h" #include "MySQLThreading.h" #include "Player.h" #include "Realm.h" #include "ScriptMgr.h" -#include "MotdMgr.h" #include "StringConvert.h" #include "UpdateTime.h" #include "VMapFactory.h" diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp index aa44a665b..f0bf32c95 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp @@ -17,8 +17,8 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "blackrock_spire.h" #include "SpellScript.h" +#include "blackrock_spire.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp index c4f86b15e..6bd29958b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -20,8 +20,8 @@ #include "InstanceScript.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "blackwing_lair.h" #include "SpellScript.h" +#include "blackwing_lair.h" enum Say { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index 8ebc9569b..fa2596f19 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -23,9 +23,9 @@ #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SpellScript.h" +#include "TaskScheduler.h" #include "TemporarySummon.h" #include "blackwing_lair.h" -#include "TaskScheduler.h" enum Events { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp index a7bfacc5c..6ff967c87 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp @@ -15,7 +15,6 @@ * with this program. If not, see . */ -#include "karazhan.h" #include "ObjectMgr.h" #include "Player.h" #include "ScriptMgr.h" @@ -23,11 +22,12 @@ #include "ScriptedEscortAI.h" #include "ScriptedFollowerAI.h" #include "ScriptedGossip.h" -#include "SpellInfo.h" #include "SpellAuras.h" +#include "SpellInfo.h" #include "SpellScript.h" #include "Unit.h" #include "World.h" +#include "karazhan.h" #include diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 80f09e547..4b128ad96 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -18,9 +18,9 @@ #include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "karazhan.h" #include "SpellAuraEffects.h" #include "SpellScript.h" +#include "karazhan.h" enum Emotes { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 75ab5f75e..aef6851a6 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -22,8 +22,8 @@ #include "SpellAuras.h" #include "SpellInfo.h" #include "SpellScript.h" -#include "karazhan.h" #include "TaskScheduler.h" +#include "karazhan.h" enum Texts { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 59a348e61..5b4f52ba8 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -24,10 +24,10 @@ EndScriptData */ #include "Player.h" #include "ScriptMgr.h" -#include "TaskScheduler.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SpellInfo.h" +#include "TaskScheduler.h" #include "karazhan.h" /***********************************/ diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 455b8de6e..34a6deb29 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -34,8 +34,8 @@ EndContentData */ #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "SpellAuras.h" #include "SpellAuraEffects.h" +#include "SpellAuras.h" #include "SpellScript.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index bf73f9095..e09413bd4 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -16,8 +16,8 @@ */ #include "InstanceScript.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "magisters_terrace.h" ObjectData const creatureData[] = diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index d65fc1a50..ee5e4f252 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -17,6 +17,7 @@ #include "CombatAI.h" #include "CreatureTextMgr.h" +#include "MoveSplineInit.h" #include "ObjectMgr.h" #include "PassiveAI.h" #include "Player.h" @@ -27,7 +28,6 @@ #include "SpellInfo.h" #include "SpellScript.h" #include "Vehicle.h" -#include "MoveSplineInit.h" /*###### ## npc_eye_of_acherus diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp index 77dd8738d..226ebce73 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp @@ -15,17 +15,17 @@ * with this program. If not, see . */ +#include "GridNotifiersImpl.h" +#include "Group.h" +#include "LFGMgr.h" +#include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "LFGMgr.h" -#include "Player.h" -#include "Group.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" -#include "shadowfang_keep.h" -#include "GridNotifiersImpl.h" +#include "SpellScript.h" #include "TaskScheduler.h" +#include "shadowfang_keep.h" enum ApothecarySpells { diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h index 9d8a9428b..3d106f8fe 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h @@ -18,9 +18,9 @@ #ifndef DEF_SHADOWFANG_H #define DEF_SHADOWFANG_H +#include "CreatureAIImpl.h" #include "SpellAuraEffects.h" #include "SpellScript.h" -#include "CreatureAIImpl.h" #define DataHeader "SK" #define ShadowfangKeepScriptName "instance_shadowfang_keep" diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index dec10234d..e73bb8534 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -21,8 +21,8 @@ #include "Player.h" #include "ScriptMgr.h" #include "SpellScript.h" -#include "sunken_temple.h" #include "Unit.h" +#include "sunken_temple.h" class instance_sunken_temple : public InstanceMapScript { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 37e7cd3d6..5dc93c772 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -15,14 +15,14 @@ * with this program. If not, see . */ +#include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuras.h" #include "SpellScript.h" -#include "zulgurub.h" -#include "Player.h" #include "TaskScheduler.h" +#include "zulgurub.h" enum Says { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index e7c0040f1..3e3dc1e73 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -16,9 +16,9 @@ */ #include "GameObjectAI.h" -#include "SpellScript.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "SpellScript.h" #include "TaskScheduler.h" #include "zulgurub.h" diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 62a5e6ef9..839dc5fef 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "SharedDefines.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "SharedDefines.h" #include "TaskScheduler.h" #include "zulgurub.h" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index c331c20c3..4efa7e2fb 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -17,9 +17,9 @@ #include "the_black_morass.h" #include "MoveSplineInit.h" -#include "SmartAI.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "SmartAI.h" enum medivhMisc { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index b86be2de9..af9dde742 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -23,8 +23,8 @@ #include "ScriptedCreature.h" #include "SpellInfo.h" #include "SpellScript.h" -#include "ruins_of_ahnqiraj.h" #include "TaskScheduler.h" +#include "ruins_of_ahnqiraj.h" enum Texts { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index 09abac426..18d689262 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "SmartAI.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" +#include "SmartAI.h" #include "SpellScript.h" #include "ruins_of_ahnqiraj.h" diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp index 13d2f47d6..e6fa818dd 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "ruins_of_ahnqiraj.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "SpellScript.h" -#include "ruins_of_ahnqiraj.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 078a55939..974f3e960 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -17,8 +17,8 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "SpellScript.h" #include "SpellAuras.h" +#include "SpellScript.h" #include "temple_of_ahnqiraj.h" enum Emotes diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index a37f76e68..bcf7496c3 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -16,8 +16,8 @@ */ #include "ScriptMgr.h" -#include "SpellScript.h" #include "ScriptedCreature.h" +#include "SpellScript.h" #include "temple_of_ahnqiraj.h" enum Says diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp index cebddfb7c..293ea8876 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "temple_of_ahnqiraj.h" #include "MapReference.h" #include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "SpellScript.h" -#include "temple_of_ahnqiraj.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index b25769c44..807ea6211 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -17,9 +17,9 @@ #include "GameTime.h" #include "Player.h" -#include "ScriptedGossip.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" #include "SpellScript.h" #include "TaskScheduler.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp index 6c63243a4..b9c27e0d0 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp @@ -23,8 +23,8 @@ #include "ScriptedGossip.h" #include "SpellAuraEffects.h" #include "SpellScript.h" -#include "Vehicle.h" #include "TaskScheduler.h" +#include "Vehicle.h" enum Texts { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp index b9c71bbef..7d675e395 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "utgarde_pinnacle.h" #include "ScriptMgr.h" #include "SpellInfo.h" #include "SpellScript.h" #include "Unit.h" -#include "utgarde_pinnacle.h" enum UtgardeSpells { diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index dcf3418b3..577e911c8 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -25,8 +25,8 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "SpellAuras.h" #include "SpellAuraEffects.h" +#include "SpellAuras.h" #include "SpellScript.h" #include "Vehicle.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index 409a9e104..5961de5b1 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -16,6 +16,7 @@ */ #include "OutdoorPvPTF.h" +#include "GameTime.h" #include "Language.h" #include "MapMgr.h" #include "ObjectMgr.h" @@ -24,7 +25,6 @@ #include "ScriptMgr.h" #include "World.h" #include "WorldPacket.h" -#include "GameTime.h" OutdoorPvPTF::OutdoorPvPTF() { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 574051d54..92a22a121 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -17,8 +17,8 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "serpent_shrine.h" #include "TaskScheduler.h" +#include "serpent_shrine.h" enum Talk { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index e162c8ade..d8d14c556 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -19,8 +19,8 @@ #include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "serpent_shrine.h" #include "TaskScheduler.h" +#include "serpent_shrine.h" enum Talk { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index 93ebcb991..def888bda 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -17,8 +17,8 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "SpellScript.h" #include "SpellAuras.h" +#include "SpellScript.h" #include "steam_vault.h" enum Texts diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 146080b63..630782c74 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "PassiveAI.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "SpellScript.h" #include "gruuls_lair.h" -#include "PassiveAI.h" enum Yells { diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index cee8cf339..15f5a072c 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -21,8 +21,8 @@ #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "SpellInfo.h" #include "SpellAuras.h" +#include "SpellInfo.h" #include "SpellScript.h" // Ours diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index f6adc09be..fd8310371 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -24,8 +24,8 @@ #include "Battleground.h" #include "GameTime.h" #include "ObjectMgr.h" -#include "Player.h" #include "Pet.h" +#include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "SkillDiscovery.h" diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp index 103fb50b6..ab73b658f 100644 --- a/src/server/scripts/World/chat_log.cpp +++ b/src/server/scripts/World/chat_log.cpp @@ -18,8 +18,8 @@ #include "Channel.h" #include "Group.h" #include "Guild.h" -#include "ScriptMgr.h" #include "Log.h" +#include "ScriptMgr.h" class ChatLogScript : public PlayerScript { diff --git a/src/server/scripts/World/server_mail.cpp b/src/server/scripts/World/server_mail.cpp index 4f5a250b2..245fd7b36 100644 --- a/src/server/scripts/World/server_mail.cpp +++ b/src/server/scripts/World/server_mail.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "Player.h" -#include "ScriptMgr.h" #include "ObjectMgr.h" +#include "Player.h" #include "QueryResult.h" +#include "ScriptMgr.h" class ServerMailReward : public PlayerScript { diff --git a/src/server/shared/enuminfo_SharedDefines.cpp b/src/server/shared/enuminfo_SharedDefines.cpp index 751437861..0c13b3f0d 100644 --- a/src/server/shared/enuminfo_SharedDefines.cpp +++ b/src/server/shared/enuminfo_SharedDefines.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "SharedDefines.h" #include "Define.h" +#include "SharedDefines.h" #include "SmartEnum.h" #include diff --git a/src/test/mocks/WorldMock.h b/src/test/mocks/WorldMock.h index e8c8814f0..acc3c1747 100644 --- a/src/test/mocks/WorldMock.h +++ b/src/test/mocks/WorldMock.h @@ -19,8 +19,8 @@ #define AZEROTHCORE_WORLDMOCK_H #include "ArenaSpectator.h" -#include "IWorld.h" #include "Duration.h" +#include "IWorld.h" #include "gmock/gmock.h" #pragma GCC diagnostic push diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp index 83a6260aa..03fece646 100644 --- a/src/tools/mmaps_generator/PathGenerator.cpp +++ b/src/tools/mmaps_generator/PathGenerator.cpp @@ -17,8 +17,8 @@ #include "MapBuilder.h" #include "PathCommon.h" -#include "Util.h" #include "Timer.h" +#include "Util.h" #include using namespace MMAP; diff --git a/src/tools/vmap4_extractor/mpq_libmpq.cpp b/src/tools/vmap4_extractor/mpq_libmpq.cpp index f52d5b3a6..d8232388f 100644 --- a/src/tools/vmap4_extractor/mpq_libmpq.cpp +++ b/src/tools/vmap4_extractor/mpq_libmpq.cpp @@ -16,9 +16,9 @@ */ #include "mpq_libmpq04.h" +#include #include #include -#include ArchiveSet gOpenArchives;