diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index bdb96c3fd..b103dcad0 100644 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -5,11 +5,11 @@ */ #include "CombatAI.h" -#include "SpellMgr.h" -#include "SpellInfo.h" -#include "Vehicle.h" #include "ObjectAccessor.h" #include "Player.h" +#include "SpellInfo.h" +#include "SpellMgr.h" +#include "Vehicle.h" ///////////////// // AggressorAI diff --git a/src/server/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h index 3b5ab21e8..a495dbfdf 100644 --- a/src/server/game/AI/CoreAI/CombatAI.h +++ b/src/server/game/AI/CoreAI/CombatAI.h @@ -7,9 +7,9 @@ #ifndef ACORE_COMBATAI_H #define ACORE_COMBATAI_H +#include "ConditionMgr.h" #include "CreatureAI.h" #include "CreatureAIImpl.h" -#include "ConditionMgr.h" class Creature; diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h index 97e71b76b..38b8a6ee1 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.h +++ b/src/server/game/AI/CoreAI/GameObjectAI.h @@ -7,12 +7,12 @@ #ifndef ACORE_GAMEOBJECTAI_H #define ACORE_GAMEOBJECTAI_H +#include "CreatureAI.h" #include "Define.h" -#include +#include "GameObject.h" #include "Object.h" #include "QuestDef.h" -#include "GameObject.h" -#include "CreatureAI.h" +#include class GameObjectAI { diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp index c2226d217..0467bcc46 100644 --- a/src/server/game/AI/CoreAI/GuardAI.cpp +++ b/src/server/game/AI/CoreAI/GuardAI.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "GuardAI.h" -#include "Errors.h" -#include "Player.h" -#include "ObjectAccessor.h" -#include "World.h" #include "CreatureAIImpl.h" +#include "Errors.h" +#include "GuardAI.h" +#include "ObjectAccessor.h" +#include "Player.h" +#include "World.h" int GuardAI::Permissible(Creature const* creature) { diff --git a/src/server/game/AI/CoreAI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp index fe41e6988..a9decc1a4 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.cpp +++ b/src/server/game/AI/CoreAI/PassiveAI.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "PassiveAI.h" #include "Creature.h" +#include "PassiveAI.h" #include "TemporarySummon.h" PassiveAI::PassiveAI(Creature* c) : CreatureAI(c) { me->SetReactState(REACT_PASSIVE); } diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index 282bf1285..55d84681c 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -4,20 +4,20 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "PetAI.h" -#include "Errors.h" -#include "Pet.h" -#include "Player.h" -#include "DBCStores.h" -#include "Spell.h" -#include "ObjectAccessor.h" -#include "SpellMgr.h" #include "Creature.h" -#include "World.h" -#include "Util.h" +#include "DBCStores.h" +#include "Errors.h" #include "Group.h" -#include "SpellInfo.h" +#include "ObjectAccessor.h" +#include "Pet.h" +#include "PetAI.h" +#include "Player.h" +#include "Spell.h" #include "SpellAuraEffects.h" +#include "SpellInfo.h" +#include "SpellMgr.h" +#include "Util.h" +#include "World.h" #include "WorldSession.h" int PetAI::Permissible(const Creature* creature) diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp index b1213819f..a5e750e97 100644 --- a/src/server/game/AI/CoreAI/ReactorAI.cpp +++ b/src/server/game/AI/CoreAI/ReactorAI.cpp @@ -5,11 +5,11 @@ */ #include "ByteBuffer.h" -#include "ReactorAI.h" +#include "CreatureAIImpl.h" #include "Errors.h" #include "Log.h" #include "ObjectAccessor.h" -#include "CreatureAIImpl.h" +#include "ReactorAI.h" int ReactorAI::Permissible(const Creature* creature) { diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp index 5133e208d..c2e07ba3f 100644 --- a/src/server/game/AI/CoreAI/TotemAI.cpp +++ b/src/server/game/AI/CoreAI/TotemAI.cpp @@ -4,16 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "TotemAI.h" -#include "Totem.h" +#include "CellImpl.h" #include "Creature.h" #include "DBCStores.h" -#include "ObjectAccessor.h" -#include "SpellMgr.h" - #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "CellImpl.h" +#include "ObjectAccessor.h" +#include "SpellMgr.h" +#include "Totem.h" +#include "TotemAI.h" int TotemAI::Permissible(Creature const* creature) { diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index 884fa2ffd..25309326e 100644 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -4,15 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "UnitAI.h" -#include "Player.h" #include "Creature.h" -#include "SpellAuras.h" -#include "SpellAuraEffects.h" -#include "SpellMgr.h" -#include "SpellInfo.h" -#include "Spell.h" #include "CreatureAIImpl.h" +#include "Player.h" +#include "Spell.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellInfo.h" +#include "SpellMgr.h" +#include "UnitAI.h" void UnitAI::AttackStart(Unit* victim) { diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 9b6ca0f64..6d3f92373 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -7,9 +7,9 @@ #ifndef ACORE_UNITAI_H #define ACORE_UNITAI_H +#include "Containers.h" #include "Define.h" #include "Unit.h" -#include "Containers.h" #include class Player; diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 615c05af8..c75bcce8f 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -4,16 +4,16 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "Creature.h" #include "CreatureAI.h" #include "CreatureAIImpl.h" -#include "Creature.h" -#include "World.h" -#include "SpellMgr.h" -#include "Vehicle.h" +#include "CreatureTextMgr.h" #include "Log.h" #include "MapReference.h" #include "Player.h" -#include "CreatureTextMgr.h" +#include "SpellMgr.h" +#include "Vehicle.h" +#include "World.h" //Disable CreatureAI when charmed void CreatureAI::OnCharmed(bool /*apply*/) diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index 3e229bd37..39a29a981 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -7,9 +7,9 @@ #ifndef ACORE_CREATUREAI_H #define ACORE_CREATUREAI_H +#include "Common.h" #include "Creature.h" #include "UnitAI.h" -#include "Common.h" class WorldObject; class Unit; diff --git a/src/server/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h index 21901c741..18179b089 100644 --- a/src/server/game/AI/CreatureAIFactory.h +++ b/src/server/game/AI/CreatureAIFactory.h @@ -6,9 +6,9 @@ #ifndef ACORE_CREATUREAIFACTORY_H #define ACORE_CREATUREAIFACTORY_H -#include "ObjectRegistry.h" #include "FactoryHolder.h" #include "GameObjectAI.h" +#include "ObjectRegistry.h" struct SelectableAI : public FactoryHolder, public Permissible { diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h index 5bb947d94..bcfb23dd5 100644 --- a/src/server/game/AI/CreatureAIImpl.h +++ b/src/server/game/AI/CreatureAIImpl.h @@ -7,11 +7,10 @@ #define CREATUREAIIMPL_H #include "Common.h" -#include "Define.h" -#include "TemporarySummon.h" #include "CreatureAI.h" +#include "Define.h" #include "SpellMgr.h" - +#include "TemporarySummon.h" #include #include diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp index ddb3fa174..b0322653a 100644 --- a/src/server/game/AI/CreatureAIRegistry.cpp +++ b/src/server/game/AI/CreatureAIRegistry.cpp @@ -4,20 +4,19 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "PassiveAI.h" -#include "ReactorAI.h" #include "CombatAI.h" -#include "GuardAI.h" -#include "PetAI.h" -#include "TotemAI.h" -#include "RandomMovementGenerator.h" -#include "MovementGeneratorImpl.h" -#include "CreatureAIRegistry.h" -#include "WaypointMovementGenerator.h" #include "CreatureAIFactory.h" +#include "CreatureAIRegistry.h" +#include "GuardAI.h" +#include "MovementGeneratorImpl.h" +#include "PassiveAI.h" +#include "PetAI.h" +#include "RandomMovementGenerator.h" +#include "ReactorAI.h" #include "SmartAI.h" +#include "TotemAI.h" +#include "WaypointMovementGenerator.h" -//#include "CreatureAIImpl.h" namespace AIRegistry { void Initialize() diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp index 4973be348..f87a91746 100644 --- a/src/server/game/AI/CreatureAISelector.cpp +++ b/src/server/game/AI/CreatureAISelector.cpp @@ -5,14 +5,13 @@ */ #include "Creature.h" -#include "CreatureAISelector.h" -#include "PassiveAI.h" - -#include "MovementGenerator.h" -#include "Pet.h" -#include "TemporarySummon.h" #include "CreatureAIFactory.h" +#include "CreatureAISelector.h" +#include "MovementGenerator.h" +#include "PassiveAI.h" +#include "Pet.h" #include "ScriptMgr.h" +#include "TemporarySummon.h" namespace FactorySelector { diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 0bcc10dad..9eafa136e 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -5,14 +5,14 @@ * This program is free software licensed under GPL version 2 * Please see the included DOCS/LICENSE.TXT for more information */ -#include "ScriptedCreature.h" -#include "Item.h" -#include "Spell.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" #include "Cell.h" #include "CellImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "Item.h" #include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "Spell.h" #include "TemporarySummon.h" // Spell summary for ScriptedAI::SelectSpell diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 0014c6867..18e41c099 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -10,10 +10,10 @@ SDComment: SDCategory: Npc EndScriptData */ -#include "ScriptedCreature.h" -#include "ScriptedEscortAI.h" #include "Group.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" enum ePoints { diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h index 5afcfa299..b5018de77 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h @@ -7,6 +7,7 @@ #define SC_ESCORTAI_H #include "ScriptSystem.h" +#include "ScriptedCreature.h" #define DEFAULT_MAX_PLAYER_DISTANCE 50 diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index 6dbc4d079..84c104dbd 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -10,10 +10,10 @@ SDComment: This AI is under development SDCategory: Npc EndScriptData */ -#include "ScriptedCreature.h" -#include "ScriptedFollowerAI.h" #include "Group.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedFollowerAI.h" const float MAX_PLAYER_DISTANCE = 100.0f; diff --git a/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp index f000c3af6..750401785 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptedGossip.h" -#include "Player.h" #include "Creature.h" +#include "Player.h" +#include "ScriptedGossip.h" void ClearGossipMenuFor(Player* player) { diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 96f71bd5d..c47718e58 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -4,20 +4,20 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "DatabaseEnv.h" -#include "ObjectMgr.h" -#include "ObjectDefines.h" -#include "GridDefines.h" -#include "GridNotifiers.h" -#include "SpellMgr.h" -#include "GridNotifiersImpl.h" #include "Cell.h" #include "CellImpl.h" -#include "InstanceScript.h" -#include "ScriptedCreature.h" +#include "DatabaseEnv.h" +#include "GridDefines.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "Group.h" -#include "SmartAI.h" +#include "InstanceScript.h" +#include "ObjectDefines.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "SmartAI.h" +#include "SpellMgr.h" #include "Vehicle.h" SmartAI::SmartAI(Creature* c) : CreatureAI(c) diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 667d54c32..022a9b9f1 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -10,12 +10,11 @@ #include "Common.h" #include "Creature.h" #include "CreatureAI.h" -#include "Unit.h" -#include "Spell.h" - +#include "GameObjectAI.h" #include "SmartScript.h" #include "SmartScriptMgr.h" -#include "GameObjectAI.h" +#include "Spell.h" +#include "Unit.h" enum SmartEscortState { diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 3cc5b77cb..3b68888ce 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Chat.h" #include "Cell.h" #include "CellImpl.h" +#include "Chat.h" #include "CreatureTextMgr.h" #include "DatabaseEnv.h" #include "GameEventMgr.h" diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h index 9acaaa25b..b0be901bb 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.h +++ b/src/server/game/AI/SmartScripts/SmartScript.h @@ -10,12 +10,10 @@ #include "Common.h" #include "Creature.h" #include "CreatureAI.h" -#include "Unit.h" -#include "Spell.h" #include "GridNotifiers.h" - #include "SmartScriptMgr.h" -//#include "SmartAI.h" +#include "Spell.h" +#include "Unit.h" class SmartScript { diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index a302fd1d5..c8500f076 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -4,21 +4,20 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "DatabaseEnv.h" -#include "ObjectMgr.h" -#include "ObjectDefines.h" -#include "GridDefines.h" -#include "GridNotifiers.h" -#include "SpellMgr.h" -#include "GridNotifiersImpl.h" #include "Cell.h" #include "CellImpl.h" -#include "InstanceScript.h" -#include "ScriptedCreature.h" -#include "GameEventMgr.h" #include "CreatureTextMgr.h" - +#include "DatabaseEnv.h" +#include "GameEventMgr.h" +#include "GridDefines.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "InstanceScript.h" +#include "ObjectDefines.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" #include "SmartScriptMgr.h" +#include "SpellMgr.h" SmartWaypointMgr* SmartWaypointMgr::instance() { diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 0c90b4323..a83d95d44 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -10,11 +10,10 @@ #include "Common.h" #include "Creature.h" #include "CreatureAI.h" -#include "Unit.h" #include "Spell.h" - -//#include "SmartScript.h" //#include "SmartAI.h" +//#include "SmartScript.h" +#include "Unit.h" struct WayPoint { diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index b415be47b..0deabbfa1 100644 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -9,8 +9,8 @@ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptMgr.h" -#include "Util.h" #include "SHA1.h" +#include "Util.h" #include "WorldSession.h" namespace AccountMgr diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 0c3ec2a4a..0b5b59810 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "AchievementMgr.h" #include "AccountMgr.h" +#include "AchievementMgr.h" #include "ArenaTeam.h" #include "ArenaTeamMgr.h" -#include "BattlegroundAB.h" #include "Battleground.h" +#include "BattlegroundAB.h" #include "CellImpl.h" #include "Chat.h" #include "Common.h" diff --git a/src/server/game/ArenaSpectator/ArenaSpectator.h b/src/server/game/ArenaSpectator/ArenaSpectator.h index 76baff76e..2013af566 100644 --- a/src/server/game/ArenaSpectator/ArenaSpectator.h +++ b/src/server/game/ArenaSpectator/ArenaSpectator.h @@ -2,15 +2,15 @@ #ifndef AZEROTHCORE_ARENASPECTATOR_H #define AZEROTHCORE_ARENASPECTATOR_H -#include "Player.h" -#include "World.h" -#include "Map.h" #include "Battleground.h" -#include "Pet.h" -#include "SpellAuras.h" -#include "SpellAuraEffects.h" #include "Chat.h" #include "LFGMgr.h" +#include "Map.h" +#include "Pet.h" +#include "Player.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "World.h" #define SPECTATOR_ADDON_VERSION 27 #define SPECTATOR_BUFFER_LEN 150 diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 2a15d658e..4ca477b57 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -4,23 +4,23 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "AccountMgr.h" +#include "AsyncAuctionListing.h" +#include "AuctionHouseMgr.h" +#include "AvgDiffTracker.h" #include "Common.h" -#include "ObjectMgr.h" -#include "Player.h" -#include "World.h" -#include "WorldPacket.h" -#include "WorldSession.h" #include "DatabaseEnv.h" #include "DBCStores.h" -#include "ScriptMgr.h" -#include "AccountMgr.h" -#include "AuctionHouseMgr.h" #include "Item.h" #include "Language.h" #include "Logging/Log.h" +#include "ObjectMgr.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" #include -#include "AvgDiffTracker.h" -#include "AsyncAuctionListing.h" enum eAuctionHouse { diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index f8436cf8c..7708ffc28 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -6,21 +6,21 @@ #include "Battlefield.h" #include "BattlefieldMgr.h" -#include "ObjectAccessor.h" -#include "ObjectMgr.h" -#include "Map.h" -#include "MapManager.h" -#include "Group.h" -#include "WorldPacket.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" #include "CellImpl.h" #include "CreatureTextMgr.h" -#include "GroupMgr.h" -#include "Transport.h" #include "GameGraveyard.h" +#include "GridNotifiers.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "GridNotifiersImpl.h" +#include "Group.h" +#include "GroupMgr.h" +#include "Map.h" +#include "MapManager.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Transport.h" +#include "WorldPacket.h" Battlefield::Battlefield() { diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h index 66a6c1089..8c247fc1a 100644 --- a/src/server/game/Battlefield/Battlefield.h +++ b/src/server/game/Battlefield/Battlefield.h @@ -7,13 +7,13 @@ #ifndef BATTLEFIELD_H_ #define BATTLEFIELD_H_ -#include "Utilities/Util.h" -#include "SharedDefines.h" -#include "ZoneScript.h" -#include "WorldPacket.h" -#include "GameObject.h" #include "Battleground.h" +#include "GameObject.h" #include "ObjectAccessor.h" +#include "SharedDefines.h" +#include "Utilities/Util.h" +#include "WorldPacket.h" +#include "ZoneScript.h" enum BattlefieldTypes { diff --git a/src/server/game/Battlefield/BattlefieldHandler.cpp b/src/server/game/Battlefield/BattlefieldHandler.cpp index dedf000f7..633e0c5e5 100644 --- a/src/server/game/Battlefield/BattlefieldHandler.cpp +++ b/src/server/game/Battlefield/BattlefieldHandler.cpp @@ -4,16 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "Battlefield.h" +#include "BattlefieldMgr.h" #include "Common.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" -#include "WorldPacket.h" -#include "WorldSession.h" - -#include "Battlefield.h" -#include "BattlefieldMgr.h" #include "Opcodes.h" #include "Player.h" +#include "WorldPacket.h" +#include "WorldSession.h" //This send to player windows for invite player to join the war //Param1:(BattleId) the BattleId of Bf diff --git a/src/server/game/Battlefield/BattlefieldMgr.cpp b/src/server/game/Battlefield/BattlefieldMgr.cpp index 262fd5cba..13d822497 100644 --- a/src/server/game/Battlefield/BattlefieldMgr.cpp +++ b/src/server/game/Battlefield/BattlefieldMgr.cpp @@ -5,9 +5,9 @@ */ #include "BattlefieldMgr.h" -#include "Zones/BattlefieldWG.h" #include "ObjectMgr.h" #include "Player.h" +#include "Zones/BattlefieldWG.h" BattlefieldMgr::BattlefieldMgr() { diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h index bbcd324cc..9158601a9 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.h +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h @@ -7,10 +7,10 @@ #ifndef BATTLEFIELD_WG_ #define BATTLEFIELD_WG_ -#include "ObjectAccessor.h" -#include "WorldPacket.h" #include "Battlefield.h" +#include "ObjectAccessor.h" #include "World.h" +#include "WorldPacket.h" class Group; class BattlefieldWG; diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index 663a6f683..4f1bb021a 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -4,17 +4,17 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ObjectMgr.h" -#include "WorldPacket.h" #include "ArenaTeam.h" -#include "World.h" -#include "Group.h" #include "ArenaTeamMgr.h" -#include "Player.h" -#include "WorldSession.h" -#include "Opcodes.h" -#include "ScriptMgr.h" #include "BattlegroundMgr.h" +#include "Group.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" ArenaTeam::ArenaTeam() : TeamId(0), Type(0), TeamName(), CaptainGuid(0), BackgroundColor(0), EmblemStyle(0), EmblemColor(0), diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h index ff2b3fef9..ed42e5e2f 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.h +++ b/src/server/game/Battlegrounds/ArenaTeam.h @@ -7,8 +7,8 @@ #ifndef AZEROTHCORE_ARENATEAM_H #define AZEROTHCORE_ARENATEAM_H -#include "QueryResult.h" #include "Map.h" +#include "QueryResult.h" #include #include diff --git a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp index 994acc135..2d6815795 100644 --- a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp +++ b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp @@ -4,15 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Define.h" #include "ArenaTeamMgr.h" -#include "World.h" -#include "Log.h" #include "DatabaseEnv.h" +#include "Define.h" #include "Language.h" +#include "Log.h" #include "ObjectAccessor.h" #include "Player.h" #include "ScriptMgr.h" +#include "World.h" ArenaTeamMgr::ArenaTeamMgr() { diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 445464d1f..7a5ce758b 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -4,13 +4,20 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "ArenaSpectator.h" #include "ArenaTeam.h" #include "ArenaTeamMgr.h" #include "Battleground.h" +#include "BattlegroundBE.h" +#include "BattlegroundDS.h" #include "BattlegroundMgr.h" -#include "Creature.h" +#include "BattlegroundNA.h" +#include "BattlegroundRL.h" +#include "BattlegroundRV.h" #include "Chat.h" +#include "Creature.h" #include "Formulas.h" +#include "GameGraveyard.h" #include "GridNotifiersImpl.h" #include "Group.h" #include "MapManager.h" @@ -19,20 +26,14 @@ #include "Pet.h" #include "Player.h" #include "ReputationMgr.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellAuras.h" +#include "Transport.h" #include "Util.h" #include "World.h" #include "WorldPacket.h" -#include "ArenaSpectator.h" -#include "BattlegroundBE.h" -#include "BattlegroundDS.h" -#include "BattlegroundNA.h" -#include "BattlegroundRL.h" -#include "BattlegroundRV.h" -#include "Transport.h" -#include "ScriptMgr.h" -#include "GameGraveyard.h" + #ifdef ELUNA #include "LuaEngine.h" #endif diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index 438b0f204..0fd9a7bc6 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -8,9 +8,9 @@ #define __BATTLEGROUND_H #include "Common.h" -#include "SharedDefines.h" #include "DBCEnums.h" #include "GameObject.h" +#include "SharedDefines.h" class Creature; class GameObject; diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 0559124b2..0f9f8b2bc 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -4,39 +4,38 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "ObjectMgr.h" -#include "ArenaTeamMgr.h" -#include "World.h" -#include "WorldPacket.h" - #include "ArenaTeam.h" -#include "BattlegroundMgr.h" -#include "BattlegroundAV.h" +#include "ArenaTeamMgr.h" #include "BattlegroundAB.h" -#include "BattlegroundEY.h" -#include "BattlegroundWS.h" -#include "BattlegroundNA.h" +#include "BattlegroundAV.h" #include "BattlegroundBE.h" -#include "BattlegroundRL.h" -#include "BattlegroundSA.h" #include "BattlegroundDS.h" -#include "BattlegroundRV.h" +#include "BattlegroundEY.h" #include "BattlegroundIC.h" +#include "BattlegroundMgr.h" +#include "BattlegroundNA.h" +#include "BattlegroundQueue.h" +#include "BattlegroundRL.h" +#include "BattlegroundRV.h" +#include "BattlegroundSA.h" +#include "BattlegroundWS.h" #include "Chat.h" +#include "Common.h" +#include "DisableMgr.h" +#include "Formulas.h" +#include "GameEventMgr.h" +#include "GameGraveyard.h" #include "Map.h" #include "MapInstanced.h" #include "MapManager.h" -#include "Player.h" -#include "GameEventMgr.h" -#include "SharedDefines.h" -#include "Formulas.h" -#include "DisableMgr.h" +#include "ObjectMgr.h" #include "Opcodes.h" -#include "BattlegroundQueue.h" -#include "GameGraveyard.h" -#include +#include "Player.h" +#include "SharedDefines.h" +#include "World.h" +#include "WorldPacket.h" #include +#include #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h index 7c2561c75..582e0114d 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.h +++ b/src/server/game/Battlegrounds/BattlegroundMgr.h @@ -7,11 +7,11 @@ #ifndef __BATTLEGROUNDMGR_H #define __BATTLEGROUNDMGR_H -#include "Common.h" -#include "DBCEnums.h" #include "Battleground.h" #include "BattlegroundQueue.h" +#include "Common.h" #include "CreatureAIImpl.h" +#include "DBCEnums.h" #include typedef std::map BattlegroundContainer; diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp index f35f82d2a..119e1d11f 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp +++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp @@ -8,13 +8,13 @@ #include "ArenaTeamMgr.h" #include "BattlegroundMgr.h" #include "BattlegroundQueue.h" +#include "Channel.h" #include "Chat.h" #include "Group.h" -#include "Log.h" #include "Language.h" +#include "Log.h" #include "ObjectMgr.h" #include "Player.h" -#include "Channel.h" #include "ScriptMgr.h" #include diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h index 325b15d85..cf4e879da 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.h +++ b/src/server/game/Battlegrounds/BattlegroundQueue.h @@ -7,11 +7,10 @@ #ifndef __BATTLEGROUNDQUEUE_H #define __BATTLEGROUNDQUEUE_H +#include "Battleground.h" #include "Common.h" #include "DBCEnums.h" -#include "Battleground.h" #include "EventProcessor.h" - #include #define COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME 10 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp index 97efe074f..563d42b05 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -3,17 +3,17 @@ */ #include "BattlegroundAB.h" -#include "World.h" -#include "WorldPacket.h" -#include "ObjectMgr.h" #include "BattlegroundMgr.h" #include "Creature.h" +#include "GameGraveyard.h" #include "Language.h" #include "Object.h" +#include "ObjectMgr.h" #include "Player.h" #include "Util.h" +#include "World.h" +#include "WorldPacket.h" #include "WorldSession.h" -#include "GameGraveyard.h" BattlegroundAB::BattlegroundAB() { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index b3c28aefa..d4192ecf9 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -4,18 +4,17 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ObjectMgr.h" -#include "WorldPacket.h" - #include "BattlegroundAV.h" #include "Formulas.h" +#include "GameEventMgr.h" +#include "GameGraveyard.h" #include "GameObject.h" #include "Language.h" +#include "ObjectMgr.h" #include "Player.h" #include "SpellAuras.h" -#include "GameEventMgr.h" +#include "WorldPacket.h" #include "WorldSession.h" -#include "GameGraveyard.h" BattlegroundAV::BattlegroundAV() { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp index 03054227f..a64dc8ec8 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -3,17 +3,17 @@ */ #include "BattlegroundEY.h" -#include "ObjectMgr.h" -#include "World.h" -#include "WorldPacket.h" #include "BattlegroundMgr.h" #include "Creature.h" +#include "GameGraveyard.h" #include "Language.h" #include "Object.h" +#include "ObjectMgr.h" #include "Player.h" #include "Util.h" +#include "World.h" +#include "WorldPacket.h" #include "WorldSession.h" -#include "GameGraveyard.h" BattlegroundEY::BattlegroundEY() { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index 58c1785df..2b46fab51 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -5,8 +5,8 @@ #ifndef __BATTLEGROUNDEY_H #define __BATTLEGROUNDEY_H -#include "Language.h" #include "Battleground.h" +#include "Language.h" enum BG_EY_Events { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index 2df40e77a..3a6c49660 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -4,18 +4,18 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Player.h" #include "Battleground.h" #include "BattlegroundIC.h" -#include "Language.h" -#include "WorldPacket.h" -#include "GameObject.h" -#include "ObjectMgr.h" -#include "Vehicle.h" -#include "Transport.h" -#include "WorldSession.h" -#include "ScriptedCreature.h" #include "GameGraveyard.h" +#include "GameObject.h" +#include "Language.h" +#include "ObjectMgr.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "Transport.h" +#include "Vehicle.h" +#include "WorldPacket.h" +#include "WorldSession.h" BattlegroundIC::BattlegroundIC() { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp index 6430d0574..f25d8f742 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp @@ -6,13 +6,13 @@ #include "Battleground.h" #include "BattlegroundRV.h" -#include "ObjectAccessor.h" +#include "GameObject.h" #include "Language.h" +#include "ObjectAccessor.h" +#include "Pet.h" #include "Player.h" #include "WorldPacket.h" -#include "GameObject.h" #include "WorldSession.h" -#include "Pet.h" BattlegroundRV::BattlegroundRV() { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index 702ac4998..ec79dee40 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -5,13 +5,13 @@ */ #include "BattlegroundSA.h" -#include "Language.h" -#include "Player.h" +#include "GameGraveyard.h" #include "GameObject.h" +#include "Language.h" #include "ObjectMgr.h" +#include "Player.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "GameGraveyard.h" BattlegroundSA::BattlegroundSA() { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index 665f5eaa3..ac433b9f3 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -2,17 +2,17 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ +#include "BattlegroundMgr.h" #include "BattlegroundWS.h" #include "Creature.h" +#include "GameGraveyard.h" #include "GameObject.h" #include "Language.h" #include "Object.h" #include "ObjectMgr.h" -#include "BattlegroundMgr.h" #include "Player.h" #include "World.h" #include "WorldPacket.h" -#include "GameGraveyard.h" BattlegroundWS::BattlegroundWS() { diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index c50e79403..d76cfb860 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -5,12 +5,12 @@ */ #include "CalendarMgr.h" -#include "QueryResult.h" -#include "Log.h" -#include "Player.h" #include "GuildMgr.h" +#include "Log.h" #include "ObjectAccessor.h" #include "Opcodes.h" +#include "Player.h" +#include "QueryResult.h" CalendarInvite::~CalendarInvite() { diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index 9a144281c..6eaf202f7 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -4,14 +4,14 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "AccountMgr.h" #include "ChannelMgr.h" #include "Chat.h" +#include "DatabaseEnv.h" #include "ObjectMgr.h" +#include "Player.h" #include "SocialMgr.h" #include "World.h" -#include "DatabaseEnv.h" -#include "AccountMgr.h" -#include "Player.h" Channel::Channel(std::string const& name, uint32 channelId, uint32 channelDBId, TeamId teamId, bool announce, bool ownership): _announce(announce), diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index b55dec359..98ac2ac7f 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -7,15 +7,13 @@ #ifndef _CHANNEL_H #define _CHANNEL_H +#include "Common.h" +#include "WorldPacket.h" +#include "WorldSession.h" #include #include #include -#include "Common.h" - -#include "WorldSession.h" -#include "WorldPacket.h" - class Player; #define CHANNEL_BAN_DURATION DAY*60 diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h index c2e1f5174..9b1754501 100644 --- a/src/server/game/Chat/Channels/ChannelMgr.h +++ b/src/server/game/Chat/Channels/ChannelMgr.h @@ -6,8 +6,8 @@ #ifndef __ACORE_CHANNELMGR_H #define __ACORE_CHANNELMGR_H -#include "Common.h" #include "Channel.h" +#include "Common.h" #include "World.h" #include #include diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 786462e33..2837672a8 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -4,25 +4,24 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "ObjectMgr.h" -#include "World.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "DatabaseEnv.h" - #include "AccountMgr.h" #include "CellImpl.h" #include "Chat.h" +#include "ChatLink.h" +#include "Common.h" +#include "DatabaseEnv.h" #include "GridNotifiersImpl.h" #include "Language.h" #include "Log.h" +#include "ObjectMgr.h" #include "Opcodes.h" #include "Player.h" -#include "UpdateMask.h" -#include "SpellMgr.h" #include "ScriptMgr.h" -#include "ChatLink.h" +#include "SpellMgr.h" +#include "UpdateMask.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 9d1596c7a..7753670ed 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -9,7 +9,6 @@ #include "SharedDefines.h" #include "WorldSession.h" - #include class ChatHandler; diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp index b64677ec0..8836bf49a 100644 --- a/src/server/game/Chat/ChatLink.cpp +++ b/src/server/game/Chat/ChatLink.cpp @@ -5,10 +5,10 @@ */ #include "ChatLink.h" -#include "SpellMgr.h" +#include "DBCStores.h" #include "ObjectMgr.h" #include "SpellInfo.h" -#include "DBCStores.h" +#include "SpellMgr.h" // Supported shift-links (client generated and server side) // |color|Hachievement:achievement_id:player_guid:0:0:0:0:0:0:0:0|h[name]|h|r diff --git a/src/server/game/Chat/ChatLink.h b/src/server/game/Chat/ChatLink.h index 0dff0d8cf..ee8eedf89 100644 --- a/src/server/game/Chat/ChatLink.h +++ b/src/server/game/Chat/ChatLink.h @@ -8,8 +8,8 @@ #define AZEROTHCORE_CHATLINK_H #include "SharedDefines.h" -#include #include +#include struct ItemLocale; struct ItemTemplate; diff --git a/src/server/game/Combat/HostileRefManager.cpp b/src/server/game/Combat/HostileRefManager.cpp index e66775505..06fe7ea76 100644 --- a/src/server/game/Combat/HostileRefManager.cpp +++ b/src/server/game/Combat/HostileRefManager.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "DBCStructure.h" #include "HostileRefManager.h" +#include "SpellInfo.h" +#include "SpellMgr.h" #include "ThreatManager.h" #include "Unit.h" -#include "DBCStructure.h" -#include "SpellMgr.h" -#include "SpellInfo.h" HostileRefManager::~HostileRefManager() { diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index c26c3f2a3..e97b35579 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -4,17 +4,17 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ThreatManager.h" -#include "Unit.h" #include "Creature.h" #include "CreatureAI.h" #include "Map.h" -#include "Player.h" #include "ObjectAccessor.h" -#include "UnitEvents.h" +#include "Player.h" #include "SpellAuras.h" -#include "SpellMgr.h" #include "SpellInfo.h" +#include "SpellMgr.h" +#include "ThreatManager.h" +#include "Unit.h" +#include "UnitEvents.h" //============================================================== //================= ThreatCalcHelper =========================== diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h index cd7f3aba9..acfbd40e1 100644 --- a/src/server/game/Combat/ThreatManager.h +++ b/src/server/game/Combat/ThreatManager.h @@ -8,10 +8,9 @@ #define _THREATMANAGER #include "Common.h" -#include "SharedDefines.h" #include "LinkedReference/Reference.h" +#include "SharedDefines.h" #include "UnitEvents.h" - #include //============================================================== diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index f0363f746..6e64cc9e1 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -13,9 +13,9 @@ #include "ReputationMgr.h" #include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "Spell.h" #include "SpellAuras.h" #include "SpellMgr.h" -#include "Spell.h" // Checks if object meets the condition // Can have CONDITION_SOURCE_TYPE_NONE && !mReferenceId if called from a special event (ie: eventAI) diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 8bbac4d02..e4b817dd1 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -7,10 +7,10 @@ #include "DisableMgr.h" #include "ObjectMgr.h" #include "OutdoorPvP.h" -#include "SpellMgr.h" -#include "VMapManager2.h" #include "Player.h" #include "SpellInfo.h" +#include "SpellMgr.h" +#include "VMapManager2.h" namespace DisableMgr { diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index bce2c4ff9..b0a3270c0 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -4,20 +4,20 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "DBCStores.h" +#include "BattlegroundMgr.h" #include "DBCFileLoader.h" #include "DBCfmt.h" +#include "DBCStores.h" #include "Errors.h" #include "Log.h" #include "SharedDefines.h" #include "SpellMgr.h" #include "TransportMgr.h" -#include "BattlegroundMgr.h" #include "World.h" -#include #include -#include #include +#include +#include typedef std::map AreaFlagByAreaID; typedef std::map AreaFlagByMapID; diff --git a/src/server/game/DungeonFinding/LFG.cpp b/src/server/game/DungeonFinding/LFG.cpp index f3bcc7aa9..7217b9ddf 100644 --- a/src/server/game/DungeonFinding/LFG.cpp +++ b/src/server/game/DungeonFinding/LFG.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "LFG.h" #include "Language.h" +#include "LFG.h" #include "ObjectMgr.h" namespace lfg diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index df1bd84d5..269c8d52d 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -5,24 +5,24 @@ */ #include "Common.h" -#include "SharedDefines.h" #include "DBCStores.h" #include "DisableMgr.h" -#include "ObjectMgr.h" -#include "SocialMgr.h" +#include "GameEventMgr.h" +#include "Group.h" +#include "GroupMgr.h" #include "Language.h" -#include "LFGMgr.h" -#include "LFGScripts.h" #include "LFGGroupData.h" +#include "LFGMgr.h" #include "LFGPlayerData.h" #include "LFGQueue.h" -#include "Group.h" -#include "SpellAuras.h" -#include "Player.h" -#include "GroupMgr.h" -#include "GameEventMgr.h" -#include "WorldSession.h" +#include "LFGScripts.h" +#include "ObjectMgr.h" #include "Opcodes.h" +#include "Player.h" +#include "SharedDefines.h" +#include "SocialMgr.h" +#include "SpellAuras.h" +#include "WorldSession.h" namespace lfg { diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index d301baddf..4f267d27e 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -10,9 +10,9 @@ #include "DBCStructure.h" #include "Field.h" #include "LFG.h" -#include "LFGQueue.h" #include "LFGGroupData.h" #include "LFGPlayerData.h" +#include "LFGQueue.h" #include "Map.h" class Group; diff --git a/src/server/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp index 31ce34e3d..9ecdbd52c 100644 --- a/src/server/game/DungeonFinding/LFGPlayerData.cpp +++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "LFGPlayerData.h" #include "LFGMgr.h" +#include "LFGPlayerData.h" namespace lfg { diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp index 00799010b..1429232a7 100644 --- a/src/server/game/DungeonFinding/LFGQueue.cpp +++ b/src/server/game/DungeonFinding/LFGQueue.cpp @@ -14,17 +14,17 @@ * with this program. If not, see . */ -#include "ObjectDefines.h" #include "Containers.h" -#include "DBCStructure.h" #include "DBCStores.h" +#include "DBCStructure.h" #include "Group.h" -#include "LFGQueue.h" +#include "GroupMgr.h" #include "LFGMgr.h" +#include "LFGQueue.h" #include "Log.h" +#include "ObjectDefines.h" #include "ObjectMgr.h" #include "World.h" -#include "GroupMgr.h" namespace lfg { diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index 7e7f62daf..3aa2023fc 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -9,13 +9,13 @@ */ #include "Common.h" -#include "SharedDefines.h" -#include "Player.h" #include "Group.h" -#include "LFGScripts.h" #include "LFGMgr.h" -#include "ScriptMgr.h" +#include "LFGScripts.h" #include "ObjectAccessor.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "SharedDefines.h" #include "WorldSession.h" namespace lfg diff --git a/src/server/game/DungeonFinding/LFGScripts.h b/src/server/game/DungeonFinding/LFGScripts.h index 3dc4a025d..8f9cdb205 100644 --- a/src/server/game/DungeonFinding/LFGScripts.h +++ b/src/server/game/DungeonFinding/LFGScripts.h @@ -9,8 +9,8 @@ */ #include "Common.h" -#include "SharedDefines.h" #include "ScriptMgr.h" +#include "SharedDefines.h" class Player; class Group; diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp index 6bdeb27c2..b232064cf 100644 --- a/src/server/game/Entities/Corpse/Corpse.cpp +++ b/src/server/game/Entities/Corpse/Corpse.cpp @@ -6,12 +6,12 @@ #include "Common.h" #include "Corpse.h" +#include "DatabaseEnv.h" +#include "GossipDef.h" +#include "ObjectAccessor.h" +#include "Opcodes.h" #include "Player.h" #include "UpdateMask.h" -#include "ObjectAccessor.h" -#include "DatabaseEnv.h" -#include "Opcodes.h" -#include "GossipDef.h" #include "World.h" Corpse::Corpse(CorpseType type) : WorldObject(type != CORPSE_BONES), m_type(type) diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h index 4f2ebb63b..714405ae1 100644 --- a/src/server/game/Entities/Corpse/Corpse.h +++ b/src/server/game/Entities/Corpse/Corpse.h @@ -7,10 +7,10 @@ #ifndef AZEROTHCORE_CORPSE_H #define AZEROTHCORE_CORPSE_H -#include "Object.h" #include "DatabaseEnv.h" #include "GridDefines.h" #include "LootMgr.h" +#include "Object.h" enum CorpseType { diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index c93d64909..e96cc8c01 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -7,15 +7,14 @@ #include "BattlegroundMgr.h" #include "CellImpl.h" #include "Common.h" +#include "Creature.h" #include "CreatureAI.h" #include "CreatureAISelector.h" #include "CreatureGroups.h" -#include "Creature.h" #include "DatabaseEnv.h" #include "Formulas.h" #include "GameEventMgr.h" #include "GossipDef.h" -#include "ScriptedGossip.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "Group.h" @@ -32,17 +31,17 @@ #include "Player.h" #include "PoolMgr.h" #include "QuestDef.h" +#include "ScriptedGossip.h" #include "SpellAuraEffects.h" #include "SpellMgr.h" #include "TemporarySummon.h" +#include "Transport.h" #include "Util.h" #include "Vehicle.h" #include "WaypointMovementGenerator.h" #include "World.h" #include "WorldPacket.h" -#include "Transport.h" - #ifdef ELUNA #include "LuaEngine.h" #endif diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index eba29952b..fdf07273d 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -7,14 +7,13 @@ #ifndef AZEROTHCORE_CREATURE_H #define AZEROTHCORE_CREATURE_H +#include "Cell.h" #include "Common.h" -#include "Unit.h" -#include "UpdateMask.h" +#include "DatabaseEnv.h" #include "ItemTemplate.h" #include "LootMgr.h" -#include "DatabaseEnv.h" -#include "Cell.h" - +#include "Unit.h" +#include "UpdateMask.h" #include class SpellInfo; diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 87a3ae8f5..6a8ec1e96 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -5,11 +5,10 @@ */ #include "Creature.h" -#include "CreatureGroups.h" -#include "ObjectMgr.h" - #include "CreatureAI.h" +#include "CreatureGroups.h" #include "MoveSplineInit.h" +#include "ObjectMgr.h" FormationMgr::~FormationMgr() { diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h index 11264e24c..3f932620f 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.h +++ b/src/server/game/Entities/Creature/CreatureGroups.h @@ -8,8 +8,9 @@ #define _FORMATIONS_H #include "Define.h" -#include +#include "Unit.h" #include +#include class Creature; class CreatureGroup; diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index 29e1c2c82..c9e84d540 100644 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -4,13 +4,13 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "QuestDef.h" +#include "Formulas.h" #include "GossipDef.h" #include "ObjectMgr.h" #include "Opcodes.h" +#include "QuestDef.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Formulas.h" GossipMenu::GossipMenu() { diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h index f91ab33b3..bbe212a06 100644 --- a/src/server/game/Entities/Creature/GossipDef.h +++ b/src/server/game/Entities/Creature/GossipDef.h @@ -8,8 +8,8 @@ #define AZEROTHCORE_GOSSIP_H #include "Common.h" -#include "QuestDef.h" #include "NPCHandler.h" +#include "QuestDef.h" class WorldSession; diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 9f4b0b4a5..59d885330 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -4,14 +4,14 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "CreatureAI.h" #include "Log.h" #include "ObjectAccessor.h" -#include "CreatureAI.h" #include "ObjectMgr.h" -#include "TemporarySummon.h" #include "Pet.h" #include "Player.h" #include "ScriptMgr.h" +#include "TemporarySummon.h" TempSummon::TempSummon(SummonPropertiesEntry const* properties, uint64 owner, bool isWorldObject) : Creature(isWorldObject), m_Properties(properties), m_type(TEMPSUMMON_MANUAL_DESPAWN), diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp index d1e6471fc..7c06bda92 100644 --- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp +++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp @@ -4,17 +4,17 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "CellImpl.h" #include "Common.h" -#include "UpdateMask.h" -#include "Opcodes.h" -#include "World.h" -#include "ObjectAccessor.h" #include "DatabaseEnv.h" #include "GridNotifiers.h" -#include "CellImpl.h" #include "GridNotifiersImpl.h" +#include "ObjectAccessor.h" +#include "Opcodes.h" #include "ScriptMgr.h" #include "Transport.h" +#include "UpdateMask.h" +#include "World.h" DynamicObject::DynamicObject(bool isWorldObject) : WorldObject(isWorldObject), MovableMapObject(), _aura(nullptr), _removedAura(nullptr), _caster(nullptr), _duration(0), _isViewpoint(false) diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index aef9d2d93..ab5a7da38 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -4,13 +4,13 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include -#include "GameObjectAI.h" +#include "AccountMgr.h" #include "BattlegroundAV.h" #include "CellImpl.h" #include "CreatureAISelector.h" #include "DisableMgr.h" #include "DynamicTree.h" +#include "GameObjectAI.h" #include "GameObjectModel.h" #include "GridNotifiersImpl.h" #include "Group.h" @@ -20,10 +20,11 @@ #include "PoolMgr.h" #include "ScriptMgr.h" #include "SpellMgr.h" +#include "Transport.h" #include "UpdateFieldFlags.h" #include "World.h" -#include "Transport.h" -#include "AccountMgr.h" +#include + #ifdef ELUNA #include "LuaEngine.h" #endif diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index de02f84c9..60c7bc212 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -8,12 +8,12 @@ #define AZEROTHCORE_GAMEOBJECT_H #include "Common.h" -#include "SharedDefines.h" -#include "Unit.h" -#include "Object.h" -#include "LootMgr.h" #include "DatabaseEnv.h" #include "G3D/Quat.h" +#include "LootMgr.h" +#include "Object.h" +#include "SharedDefines.h" +#include "Unit.h" class GameObjectAI; class Transport; diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp index 4cca1bfb6..129778d54 100644 --- a/src/server/game/Entities/Item/Container/Bag.cpp +++ b/src/server/game/Entities/Item/Container/Bag.cpp @@ -4,14 +4,13 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "ObjectMgr.h" -#include "DatabaseEnv.h" - #include "Bag.h" +#include "Common.h" +#include "DatabaseEnv.h" #include "Log.h" -#include "UpdateData.h" +#include "ObjectMgr.h" #include "Player.h" +#include "UpdateData.h" Bag::Bag(): Item() { diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index bd79d990a..7c605d135 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -5,16 +5,16 @@ */ #include "Common.h" -#include "Item.h" -#include "ObjectMgr.h" -#include "WorldPacket.h" -#include "DatabaseEnv.h" -#include "ItemEnchantmentMgr.h" -#include "SpellMgr.h" -#include "SpellInfo.h" -#include "ScriptMgr.h" #include "ConditionMgr.h" +#include "DatabaseEnv.h" +#include "Item.h" +#include "ItemEnchantmentMgr.h" +#include "ObjectMgr.h" #include "Player.h" +#include "ScriptMgr.h" +#include "SpellInfo.h" +#include "SpellMgr.h" +#include "WorldPacket.h" #include "WorldSession.h" void AddItemsSetItem(Player* player, Item* item) diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h index 47da2e7b9..cd8f19f13 100644 --- a/src/server/game/Entities/Item/Item.h +++ b/src/server/game/Entities/Item/Item.h @@ -8,10 +8,10 @@ #define AZEROTHCORE_ITEM_H #include "Common.h" -#include "Object.h" -#include "LootMgr.h" -#include "ItemTemplate.h" #include "DatabaseEnv.h" +#include "ItemTemplate.h" +#include "LootMgr.h" +#include "Object.h" class SpellInfo; class Bag; diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp index 7d5a6809b..ee65e888a 100644 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp @@ -4,16 +4,16 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include -#include -#include "ItemEnchantmentMgr.h" #include "DatabaseEnv.h" +#include "DBCStores.h" +#include "ItemEnchantmentMgr.h" #include "Log.h" #include "ObjectMgr.h" -#include -#include #include "Util.h" -#include "DBCStores.h" +#include +#include +#include +#include struct EnchStoreItem { diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index c4945f9f9..1cbb8122f 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -4,48 +4,48 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "Physics.h" -#include "SharedDefines.h" -#include "WorldPacket.h" -#include "Opcodes.h" -#include "Log.h" -#include "World.h" -#include "Object.h" -#include "Creature.h" -#include "Player.h" -#include "Vehicle.h" -#include "ObjectMgr.h" -#include "UpdateData.h" -#include "UpdateMask.h" -#include "Util.h" -#include "MapManager.h" -#include "ObjectAccessor.h" -#include "Log.h" -#include "Transport.h" -#include "TargetedMovementGenerator.h" -#include "WaypointMovementGenerator.h" -#include "VMapFactory.h" -#include "CellImpl.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" -#include "SpellAuraEffects.h" #include "Battlefield.h" #include "BattlefieldMgr.h" -#include "UpdateFieldFlags.h" +#include "CellImpl.h" +#include "Chat.h" +#include "Common.h" +#include "Creature.h" +#include "DynamicTree.h" +#include "DynamicVisibility.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "Group.h" +#include "Log.h" +#include "Log.h" +#include "MapManager.h" +#include "MovementPacketBuilder.h" +#include "Object.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "OutdoorPvPMgr.h" +#include "Physics.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "SharedDefines.h" +#include "SpellAuraEffects.h" +#include "TargetedMovementGenerator.h" #include "TemporarySummon.h" #include "Totem.h" -#include "OutdoorPvPMgr.h" -#include "MovementPacketBuilder.h" -#include "DynamicTree.h" -#include "Group.h" -#include "Chat.h" -#include "DynamicVisibility.h" -#include "ScriptMgr.h" +#include "Transport.h" +#include "UpdateData.h" +#include "UpdateFieldFlags.h" +#include "UpdateMask.h" +#include "Util.h" +#include "Vehicle.h" +#include "VMapFactory.h" +#include "WaypointMovementGenerator.h" +#include "World.h" +#include "WorldPacket.h" #ifdef ELUNA -#include "LuaEngine.h" #include "ElunaEventMgr.h" +#include "LuaEngine.h" #endif uint32 GuidHigh2TypeId(uint32 guid_hi) diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index c0e04f22b..1c07acb1a 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -9,21 +9,20 @@ #include "Common.h" #include "DataMap.h" -#include "UpdateMask.h" -#include "UpdateData.h" -#include "GridReference.h" -#include "ObjectDefines.h" #include "GridDefines.h" +#include "GridReference.h" #include "Map.h" +#include "ObjectDefines.h" +#include "UpdateData.h" +#include "UpdateMask.h" +#include +#include +#include #ifdef ELUNA class ElunaEventProcessor; #endif -#include -#include -#include - enum TypeMask { TYPEMASK_OBJECT = 0x0001, diff --git a/src/server/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp index 2258490ab..762bac92e 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.cpp +++ b/src/server/game/Entities/Object/Updates/UpdateData.cpp @@ -4,13 +4,13 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" #include "ByteBuffer.h" -#include "WorldPacket.h" -#include "UpdateData.h" +#include "Common.h" #include "Log.h" #include "Opcodes.h" +#include "UpdateData.h" #include "World.h" +#include "WorldPacket.h" #include "zlib.h" UpdateData::UpdateData() : m_blockCount(0) diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h index a77f84153..dfe384852 100644 --- a/src/server/game/Entities/Object/Updates/UpdateData.h +++ b/src/server/game/Entities/Object/Updates/UpdateData.h @@ -8,6 +8,7 @@ #define __UPDATEDATA_H #include "ByteBuffer.h" + class WorldPacket; enum OBJECT_UPDATE_TYPE diff --git a/src/server/game/Entities/Object/Updates/UpdateFieldFlags.h b/src/server/game/Entities/Object/Updates/UpdateFieldFlags.h index 7d93aee72..fa6d95d17 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFieldFlags.h +++ b/src/server/game/Entities/Object/Updates/UpdateFieldFlags.h @@ -7,8 +7,8 @@ #ifndef _UPDATEFIELDFLAGS_H #define _UPDATEFIELDFLAGS_H -#include "UpdateFields.h" #include "Define.h" +#include "UpdateFields.h" enum UpdatefieldFlags { diff --git a/src/server/game/Entities/Object/Updates/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h index 369de9a97..340fed1d7 100644 --- a/src/server/game/Entities/Object/Updates/UpdateMask.h +++ b/src/server/game/Entities/Object/Updates/UpdateMask.h @@ -7,9 +7,9 @@ #ifndef __UPDATEMASK_H #define __UPDATEMASK_H -#include "UpdateFields.h" -#include "Errors.h" #include "ByteBuffer.h" +#include "Errors.h" +#include "UpdateFields.h" class UpdateMask { diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index e00a3049a..bdc76df25 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -4,24 +4,24 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "ArenaSpectator.h" +#include "Battleground.h" #include "Common.h" -#include "DatabaseEnv.h" -#include "Log.h" -#include "WorldPacket.h" -#include "ObjectMgr.h" -#include "SpellMgr.h" -#include "Pet.h" -#include "Formulas.h" -#include "SpellAuras.h" -#include "SpellAuraEffects.h" #include "CreatureAI.h" +#include "DatabaseEnv.h" +#include "Formulas.h" +#include "Group.h" +#include "InstanceScript.h" +#include "Log.h" +#include "ObjectMgr.h" +#include "Pet.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellMgr.h" #include "Unit.h" #include "Util.h" -#include "Group.h" +#include "WorldPacket.h" #include "WorldSession.h" -#include "Battleground.h" -#include "InstanceScript.h" -#include "ArenaSpectator.h" Pet::Pet(Player* owner, PetType type) : Guardian(nullptr, owner ? owner->GetGUID() : 0, true), m_usedTalentCount(0), m_removed(false), m_owner(owner), diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index bc997d190..b5ecfa300 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Player.h" #include "AccountMgr.h" #include "AchievementMgr.h" +#include "ArenaSpectator.h" #include "ArenaTeam.h" #include "ArenaTeamMgr.h" #include "Battlefield.h" @@ -27,6 +27,9 @@ #include "DisableMgr.h" #include "Formulas.h" #include "GameEventMgr.h" +#include "GameGraveyard.h" +#include "GameObjectAI.h" +#include "GitRevision.h" #include "GossipDef.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" @@ -34,8 +37,6 @@ #include "GroupMgr.h" #include "Guild.h" #include "GuildMgr.h" -#include "GitRevision.h" -#include "revision.h" #include "InstanceSaveMgr.h" #include "InstanceScript.h" #include "Language.h" @@ -51,14 +52,20 @@ #include "OutdoorPvPMgr.h" #include "Pet.h" #include "PetitionMgr.h" +#include "Player.h" +#include "PoolMgr.h" #include "QuestDef.h" #include "ReputationMgr.h" +#include "revision.h" +#include "SavingSystem.h" +#include "ScriptMgr.h" #include "SkillDiscovery.h" #include "SocialMgr.h" #include "Spell.h" #include "SpellAuraEffects.h" #include "SpellAuras.h" #include "SpellMgr.h" +#include "TicketMgr.h" #include "Transport.h" #include "UpdateData.h" #include "UpdateFieldFlags.h" @@ -70,13 +77,6 @@ #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "ArenaSpectator.h" -#include "GameObjectAI.h" -#include "PoolMgr.h" -#include "SavingSystem.h" -#include "TicketMgr.h" -#include "ScriptMgr.h" -#include "GameGraveyard.h" #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index a6cce6c43..5e7ab2580 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -7,20 +7,19 @@ #ifndef _PLAYER_H #define _PLAYER_H + +#include "Battleground.h" #include "DBCStores.h" #include "GroupReference.h" -#include "MapReference.h" #include "InstanceSaveMgr.h" - #include "Item.h" +#include "MapReference.h" +#include "ObjectMgr.h" #include "PetDefines.h" #include "QuestDef.h" #include "SpellMgr.h" #include "Unit.h" -#include "Battleground.h" #include "WorldSession.h" -#include "ObjectMgr.h" - #include #include diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp index bc21ac36c..24dedd109 100644 --- a/src/server/game/Entities/Player/SocialMgr.cpp +++ b/src/server/game/Entities/Player/SocialMgr.cpp @@ -4,15 +4,14 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "SocialMgr.h" - -#include "DatabaseEnv.h" -#include "WorldSession.h" -#include "WorldPacket.h" -#include "Player.h" -#include "ObjectMgr.h" -#include "Util.h" #include "AccountMgr.h" +#include "DatabaseEnv.h" +#include "ObjectMgr.h" +#include "Player.h" +#include "SocialMgr.h" +#include "Util.h" +#include "WorldPacket.h" +#include "WorldSession.h" PlayerSocial::PlayerSocial(): m_playerGUID() { } diff --git a/src/server/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp index c391dc797..478931c70 100644 --- a/src/server/game/Entities/Totem/Totem.cpp +++ b/src/server/game/Entities/Totem/Totem.cpp @@ -4,15 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Totem.h" -#include "Log.h" #include "Group.h" +#include "Log.h" #include "ObjectMgr.h" #include "Opcodes.h" #include "Player.h" #include "SpellAuraEffects.h" -#include "SpellMgr.h" #include "SpellInfo.h" +#include "SpellMgr.h" +#include "Totem.h" #include "WorldPacket.h" Totem::Totem(SummonPropertiesEntry const* properties, uint64 owner) : Minion(properties, owner, false) diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index a0b13c52f..e39a3ed25 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -4,22 +4,22 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "Transport.h" -#include "MapManager.h" -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "WorldPacket.h" -#include "DBCStores.h" -#include "World.h" -#include "GameObjectAI.h" -#include "Vehicle.h" -#include "MapReference.h" -#include "Player.h" #include "Cell.h" #include "CellImpl.h" -#include "WorldModel.h" +#include "Common.h" +#include "DBCStores.h" +#include "GameObjectAI.h" +#include "MapManager.h" +#include "MapReference.h" +#include "ObjectMgr.h" +#include "Player.h" +#include "ScriptMgr.h" #include "Spell.h" +#include "Transport.h" +#include "Vehicle.h" +#include "World.h" +#include "WorldModel.h" +#include "WorldPacket.h" MotionTransport::MotionTransport() : Transport(), _transportInfo(nullptr), _isMoving(true), _pendingStop(false), _triggeredArrivalEvent(false), _triggeredDepartureEvent(false), _passengersLoaded(false), _delayedTeleport(false) { diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 6d7fa2b54..73396ef34 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -4,15 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Unit.h" -#include "Player.h" -#include "Pet.h" #include "Creature.h" -#include "SharedDefines.h" -#include "SpellAuras.h" -#include "SpellAuraEffects.h" -#include "SpellMgr.h" +#include "Pet.h" +#include "Player.h" #include "ScriptMgr.h" +#include "SharedDefines.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellMgr.h" +#include "Unit.h" inline bool _ModifyUInt32(bool apply, uint32& baseValue, int32& amount) { diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 509dcc3d5..34932ff50 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -4,17 +4,19 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Unit.h" -#include "Common.h" +#include "AccountMgr.h" +#include "ArenaSpectator.h" #include "Battlefield.h" #include "BattlefieldMgr.h" #include "Battleground.h" #include "CellImpl.h" +#include "Common.h" #include "ConditionMgr.h" +#include "Creature.h" #include "CreatureAI.h" #include "CreatureAIImpl.h" #include "CreatureGroups.h" -#include "Creature.h" +#include "DynamicVisibility.h" #include "Formulas.h" #include "GridNotifiersImpl.h" #include "Group.h" @@ -29,37 +31,34 @@ #include "Opcodes.h" #include "OutdoorPvP.h" #include "PassiveAI.h" -#include "PetAI.h" #include "Pet.h" +#include "PetAI.h" #include "Player.h" #include "QuestDef.h" #include "ReputationMgr.h" +#include "Spell.h" #include "SpellAuraEffects.h" #include "SpellAuras.h" -#include "Spell.h" #include "SpellInfo.h" #include "SpellMgr.h" #include "TemporarySummon.h" #include "Totem.h" #include "TotemAI.h" #include "Transport.h" +#include "Unit.h" #include "UpdateFieldFlags.h" #include "Util.h" #include "Vehicle.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "ArenaSpectator.h" -#include "DynamicVisibility.h" -#include "AccountMgr.h" +#include #ifdef ELUNA #include "LuaEngine.h" #include "ElunaEventMgr.h" #endif -#include - float baseMoveSpeed[MAX_MOVE_TYPE] = { 2.5f, // MOVE_WALK diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index b1debf734..7d81e7090 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -4,22 +4,22 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "BattlefieldWG.h" #include "Common.h" +#include "CreatureAI.h" #include "Log.h" +#include "MoveSplineInit.h" #include "ObjectMgr.h" -#include "Vehicle.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "SpellInfo.h" +#include "SpellMgr.h" +#include "TemporarySummon.h" #include "Unit.h" #include "Util.h" +#include "Vehicle.h" #include "WorldPacket.h" -#include "ScriptMgr.h" -#include "CreatureAI.h" #include "ZoneScript.h" -#include "SpellMgr.h" -#include "SpellInfo.h" -#include "MoveSplineInit.h" -#include "TemporarySummon.h" -#include "Player.h" -#include "BattlefieldWG.h" Vehicle::Vehicle(Unit* unit, VehicleEntry const* vehInfo, uint32 creatureEntry) : _me(unit), _vehicleInfo(vehInfo), _usableSeatNum(0), _creatureEntry(creatureEntry), _status(STATUS_NONE) diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index e0de328f2..b837f08c1 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -7,10 +7,10 @@ #ifndef __ACORE_VEHICLE_H #define __ACORE_VEHICLE_H -#include "ObjectDefines.h" -#include "VehicleDefines.h" #include "EventProcessor.h" +#include "ObjectDefines.h" #include "Unit.h" +#include "VehicleDefines.h" struct VehicleEntry; class Unit; diff --git a/src/server/game/Entities/Vehicle/VehicleDefines.h b/src/server/game/Entities/Vehicle/VehicleDefines.h index f0d341bfa..7967a92e3 100644 --- a/src/server/game/Entities/Vehicle/VehicleDefines.h +++ b/src/server/game/Entities/Vehicle/VehicleDefines.h @@ -10,8 +10,8 @@ #include "Define.h" #include "Map.h" #include "Object.h" -#include #include +#include struct VehicleSeatEntry; diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 692b805c6..44bb3a9f8 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -4,26 +4,27 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "BattlegroundMgr.h" #include "GameEventMgr.h" -#include "World.h" -#include "ObjectMgr.h" -#include "WorldPacket.h" -#include "PoolMgr.h" +#include "GameObjectAI.h" +#include "GossipDef.h" #include "Language.h" #include "Log.h" #include "MapManager.h" -#include "GossipDef.h" +#include "ObjectMgr.h" #include "Player.h" -#include "BattlegroundMgr.h" -#include "UnitAI.h" -#include "GameObjectAI.h" -#include "Transport.h" +#include "PoolMgr.h" #include "ScriptMgr.h" +#include "Transport.h" +#include "UnitAI.h" +#include "Util.h" +#include "World.h" +#include "WorldPacket.h" +#include + #ifdef ELUNA #include "LuaEngine.h" #endif -#include -#include "Util.h" GameEventMgr* GameEventMgr::instance() { diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index f84ea27dd..f2db6aa2e 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -4,7 +4,6 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ObjectAccessor.h" #include "CellImpl.h" #include "Corpse.h" #include "Creature.h" @@ -16,6 +15,7 @@ #include "Map.h" #include "MapInstanced.h" #include "MapManager.h" +#include "ObjectAccessor.h" #include "ObjectDefines.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -24,7 +24,6 @@ #include "Vehicle.h" #include "World.h" #include "WorldPacket.h" - #include ObjectAccessor::ObjectAccessor() diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index 05c923063..31ea86f00 100644 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -8,12 +8,12 @@ #define ACORE_OBJECTACCESSOR_H #include "Define.h" -#include "UpdateData.h" #include "GridDefines.h" #include "Object.h" +#include "UpdateData.h" #include -#include #include +#include class Creature; class Corpse; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index f413eacf6..697b6dced 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -26,8 +26,8 @@ #include "PoolMgr.h" #include "ReputationMgr.h" #include "ScriptMgr.h" -#include "SpellAuras.h" #include "Spell.h" +#include "SpellAuras.h" #include "SpellMgr.h" #include "SpellScript.h" #include "Transport.h" diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 161eb7768..41b36e8a9 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -7,28 +7,28 @@ #ifndef _OBJECTMGR_H #define _OBJECTMGR_H -#include "Log.h" -#include "Object.h" #include "Bag.h" +#include "ConditionMgr.h" +#include "Corpse.h" #include "Creature.h" +#include "DatabaseEnv.h" #include "DynamicObject.h" #include "GameObject.h" -#include "TemporarySummon.h" -#include "Corpse.h" -#include "QuestDef.h" #include "ItemTemplate.h" -#include "NPCHandler.h" -#include "DatabaseEnv.h" +#include "Log.h" #include "Mail.h" #include "Map.h" +#include "NPCHandler.h" +#include "Object.h" #include "ObjectAccessor.h" #include "ObjectDefines.h" +#include "QuestDef.h" +#include "TemporarySummon.h" #include "VehicleDefines.h" -#include -#include -#include -#include "ConditionMgr.h" #include +#include +#include +#include class Item; struct AccessRequirement; diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h index cf17e7898..e0967296b 100644 --- a/src/server/game/Grids/Cells/Cell.h +++ b/src/server/game/Grids/Cells/Cell.h @@ -7,11 +7,10 @@ #ifndef ACORE_CELL_H #define ACORE_CELL_H +#include "GridDefines.h" #include "TypeContainer.h" #include "TypeContainerVisitor.h" -#include "GridDefines.h" - class Map; class WorldObject; diff --git a/src/server/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h index 2f56e330c..e54299968 100644 --- a/src/server/game/Grids/Cells/CellImpl.h +++ b/src/server/game/Grids/Cells/CellImpl.h @@ -7,11 +7,10 @@ #ifndef ACORE_CELLIMPL_H #define ACORE_CELLIMPL_H -#include - #include "Cell.h" #include "Map.h" #include "Object.h" +#include inline Cell::Cell(CellCoord const& p) { diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp index d5c769cf1..31df5091b 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp +++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp @@ -4,17 +4,17 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "UpdateData.h" #include "Item.h" #include "Map.h" -#include "Transport.h" #include "ObjectAccessor.h" -#include "CellImpl.h" #include "SpellInfo.h" +#include "Transport.h" +#include "UpdateData.h" +#include "WorldPacket.h" +#include "WorldSession.h" using namespace acore; diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index 04b909bd2..7364252c4 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -7,19 +7,18 @@ #ifndef ACORE_GRIDNOTIFIERS_H #define ACORE_GRIDNOTIFIERS_H -#include "ObjectGridLoader.h" -#include "UpdateData.h" -#include - #include "Corpse.h" -#include "Object.h" +#include "CreatureAI.h" #include "DynamicObject.h" #include "GameObject.h" +#include "Object.h" +#include "ObjectGridLoader.h" #include "Player.h" -#include "Unit.h" -#include "CreatureAI.h" #include "Spell.h" +#include "Unit.h" +#include "UpdateData.h" #include "WorldSession.h" +#include class Player; //class Map; diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index b111bfa9e..8f5c929aa 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -7,14 +7,14 @@ #ifndef ACORE_GRIDNOTIFIERSIMPL_H #define ACORE_GRIDNOTIFIERSIMPL_H -#include "GridNotifiers.h" -#include "WorldPacket.h" #include "Corpse.h" -#include "Player.h" -#include "UpdateData.h" #include "CreatureAI.h" -#include "SpellAuras.h" +#include "GridNotifiers.h" #include "Opcodes.h" +#include "Player.h" +#include "SpellAuras.h" +#include "UpdateData.h" +#include "WorldPacket.h" template inline void acore::VisibleNotifier::Visit(GridRefManager& m) diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 744021ced..247324121 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -4,18 +4,18 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ObjectGridLoader.h" -#include "ObjectAccessor.h" -#include "ObjectMgr.h" -#include "Creature.h" -#include "Vehicle.h" -#include "GameObject.h" -#include "DynamicObject.h" -#include "Corpse.h" -#include "World.h" #include "CellImpl.h" +#include "Corpse.h" +#include "Creature.h" #include "CreatureAI.h" +#include "DynamicObject.h" +#include "GameObject.h" +#include "ObjectAccessor.h" +#include "ObjectGridLoader.h" +#include "ObjectMgr.h" #include "Transport.h" +#include "Vehicle.h" +#include "World.h" // for loading world object at grid loading (Corpses) //TODO: to implement npc on transport, also need to load npcs at grid loading diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h index b9f12c066..83181aac5 100644 --- a/src/server/game/Grids/ObjectGridLoader.h +++ b/src/server/game/Grids/ObjectGridLoader.h @@ -7,11 +7,11 @@ #ifndef ACORE_OBJECTGRIDLOADER_H #define ACORE_OBJECTGRIDLOADER_H -#include "TypeList.h" -#include "Define.h" -#include "GridLoader.h" -#include "GridDefines.h" #include "Cell.h" +#include "Define.h" +#include "GridDefines.h" +#include "GridLoader.h" +#include "TypeList.h" class ObjectWorldLoader; diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 577e8896d..1fe48f5e7 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -4,31 +4,31 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "Battleground.h" +#include "BattlegroundMgr.h" #include "Common.h" #include "DatabaseEnv.h" #include "Group.h" #include "GroupMgr.h" +#include "InstanceSaveMgr.h" +#include "LFG.h" +#include "LFGMgr.h" #include "Log.h" +#include "MapManager.h" #include "ObjectMgr.h" #include "Opcodes.h" #include "Pet.h" #include "Player.h" +#include "ScriptMgr.h" +#include "SharedDefines.h" #include "SocialMgr.h" #include "SpellAuras.h" +#include "UpdateFieldFlags.h" #include "Util.h" #include "Vehicle.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Battleground.h" -#include "BattlegroundMgr.h" -#include "LFG.h" -#include "LFGMgr.h" -#include "ScriptMgr.h" -#include "InstanceSaveMgr.h" -#include "SharedDefines.h" -#include "MapManager.h" -#include "UpdateFieldFlags.h" Roll::Roll(uint64 _guid, LootItem const& li) : itemGUID(_guid), itemid(li.itemid), itemRandomPropId(li.randomPropertyId), itemRandomSuffix(li.randomSuffix), itemCount(li.count), diff --git a/src/server/game/Groups/GroupMgr.cpp b/src/server/game/Groups/GroupMgr.cpp index e3c354a53..29562ea0c 100644 --- a/src/server/game/Groups/GroupMgr.cpp +++ b/src/server/game/Groups/GroupMgr.cpp @@ -5,10 +5,10 @@ */ #include "Common.h" +#include "DBCStores.h" #include "GroupMgr.h" #include "InstanceSaveMgr.h" #include "World.h" -#include "DBCStores.h" GroupMgr::GroupMgr() { diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 1c151bf22..6fd9f5dd2 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -13,9 +13,9 @@ #include "GuildMgr.h" #include "Language.h" #include "Log.h" +#include "Opcodes.h" #include "ScriptMgr.h" #include "SocialMgr.h" -#include "Opcodes.h" #define MAX_GUILD_BANK_TAB_TEXT_LEN 500 #define EMBLEM_PRICE 10 * GOLD diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index d0e5e2d02..51ebeb1a7 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -7,11 +7,11 @@ #ifndef AZEROTHCORE_GUILD_H #define AZEROTHCORE_GUILD_H -#include "World.h" #include "Item.h" -#include "WorldPacket.h" #include "ObjectMgr.h" #include "Player.h" +#include "World.h" +#include "WorldPacket.h" class Item; diff --git a/src/server/game/Handlers/AddonHandler.cpp b/src/server/game/Handlers/AddonHandler.cpp index b3d67c531..f1d5bda70 100644 --- a/src/server/game/Handlers/AddonHandler.cpp +++ b/src/server/game/Handlers/AddonHandler.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "zlib.h" #include "AddonHandler.h" #include "DatabaseEnv.h" -#include "Opcodes.h" #include "Log.h" +#include "Opcodes.h" +#include "zlib.h" AddonHandler::AddonHandler() { diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp index f8b03a46d..47f8fa16a 100644 --- a/src/server/game/Handlers/ArenaTeamHandler.cpp +++ b/src/server/game/Handlers/ArenaTeamHandler.cpp @@ -4,19 +4,18 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "ArenaTeam.h" +#include "ArenaTeamMgr.h" +#include "BattlegroundMgr.h" +#include "DatabaseEnv.h" +#include "Log.h" +#include "ObjectMgr.h" +#include "Opcodes.h" #include "Player.h" +#include "SocialMgr.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "DatabaseEnv.h" - -#include "ArenaTeam.h" -#include "Log.h" -#include "ObjectMgr.h" -#include "SocialMgr.h" -#include "ArenaTeamMgr.h" -#include "BattlegroundMgr.h" -#include "Opcodes.h" void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket& recvData) { diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp index 5214352f3..3c24da0bf 100644 --- a/src/server/game/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Handlers/AuctionHouseHandler.cpp @@ -4,22 +4,21 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "AccountMgr.h" +#include "AsyncAuctionListing.h" +#include "AuctionHouseMgr.h" +#include "Chat.h" +#include "Language.h" +#include "Log.h" #include "ObjectMgr.h" +#include "Opcodes.h" #include "Player.h" +#include "UpdateMask.h" +#include "Util.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "AuctionHouseMgr.h" -#include "Log.h" -#include "Language.h" -#include "Opcodes.h" -#include "UpdateMask.h" -#include "Util.h" -#include "AccountMgr.h" -#include "Chat.h" -#include "AsyncAuctionListing.h" - //void called when player click on auctioneer npc void WorldSession::HandleAuctionHelloOpcode(WorldPacket& recvData) { diff --git a/src/server/game/Handlers/AuthHandler.cpp b/src/server/game/Handlers/AuthHandler.cpp index b79b7eb40..fe53c321a 100644 --- a/src/server/game/Handlers/AuthHandler.cpp +++ b/src/server/game/Handlers/AuthHandler.cpp @@ -5,8 +5,8 @@ */ #include "Opcodes.h" -#include "WorldSession.h" #include "WorldPacket.h" +#include "WorldSession.h" void WorldSession::SendAuthResponse(uint8 code, bool shortForm, uint32 queuePos) { diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index 6f52d96fe..92b27f0c2 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -4,24 +4,24 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "ObjectAccessor.h" -#include "ObjectMgr.h" -#include "ArenaTeamMgr.h" -#include "WorldPacket.h" -#include "WorldSession.h" #include "ArenaTeam.h" -#include "BattlegroundMgr.h" +#include "ArenaTeamMgr.h" #include "Battleground.h" +#include "BattlegroundMgr.h" #include "Chat.h" -#include "Language.h" -#include "Log.h" -#include "Player.h" -#include "Object.h" -#include "Opcodes.h" +#include "Common.h" #include "DisableMgr.h" #include "Group.h" +#include "Language.h" +#include "Log.h" +#include "Object.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Player.h" #include "ScriptMgr.h" +#include "WorldPacket.h" +#include "WorldSession.h" void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket& recvData) { diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index 0e135114c..0c9efa71b 100644 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -22,19 +22,19 @@ Copied events should probably have a new owner */ +#include "ArenaTeamMgr.h" +#include "CalendarMgr.h" +#include "DatabaseEnv.h" +#include "GameEventMgr.h" +#include "GuildMgr.h" #include "InstanceSaveMgr.h" #include "Log.h" +#include "ObjectAccessor.h" #include "Opcodes.h" #include "Player.h" #include "SocialMgr.h" -#include "CalendarMgr.h" -#include "ObjectAccessor.h" -#include "DatabaseEnv.h" -#include "GuildMgr.h" -#include "ArenaTeamMgr.h" -#include "WorldSession.h" -#include "GameEventMgr.h" #include "utf8.h" +#include "WorldSession.h" void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recvData*/) { diff --git a/src/server/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp index 4c8f8d1fb..8238ebac6 100644 --- a/src/server/game/Handlers/ChannelHandler.cpp +++ b/src/server/game/Handlers/ChannelHandler.cpp @@ -4,12 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ObjectMgr.h" // for normalizePlayerName #include "ChannelMgr.h" +#include "ObjectMgr.h" // for normalizePlayerName #include "Player.h" - -#include #include "utf8.h" +#include void WorldSession::HandleJoinChannel(WorldPacket& recvPacket) { diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 1cd7e0498..9926bf508 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -13,6 +13,7 @@ #include "Chat.h" #include "Common.h" #include "DatabaseEnv.h" +#include "GitRevision.h" #include "Group.h" #include "Guild.h" #include "GuildMgr.h" @@ -23,22 +24,22 @@ #include "ObjectMgr.h" #include "Opcodes.h" #include "Pet.h" -#include "PlayerDump.h" #include "Player.h" +#include "PlayerDump.h" #include "ReputationMgr.h" #include "ScriptMgr.h" #include "ServerMotd.h" #include "SharedDefines.h" #include "SocialMgr.h" -#include "SpellAuras.h" #include "SpellAuraEffects.h" -#include "GitRevision.h" +#include "SpellAuras.h" +#include "Transport.h" #include "UpdateMask.h" #include "Util.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Transport.h" + #ifdef ELUNA #include "LuaEngine.h" #endif diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index 2939ef177..da90d88a8 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -4,30 +4,30 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "ObjectAccessor.h" -#include "ObjectMgr.h" -#include "GuildMgr.h" -#include "World.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "DatabaseEnv.h" +#include "AccountMgr.h" #include "CellImpl.h" -#include "Chat.h" #include "ChannelMgr.h" +#include "Chat.h" +#include "Common.h" +#include "DatabaseEnv.h" #include "GridNotifiersImpl.h" #include "Group.h" #include "Guild.h" +#include "GuildMgr.h" #include "Language.h" #include "Log.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" #include "Opcodes.h" #include "Player.h" -#include "SpellAuras.h" -#include "SpellAuraEffects.h" -#include "Util.h" #include "ScriptMgr.h" -#include "AccountMgr.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "Util.h" #include "Warden.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/server/game/Handlers/CombatHandler.cpp b/src/server/game/Handlers/CombatHandler.cpp index 618081145..6c5602a32 100644 --- a/src/server/game/Handlers/CombatHandler.cpp +++ b/src/server/game/Handlers/CombatHandler.cpp @@ -5,16 +5,16 @@ */ #include "Common.h" -#include "Log.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "ObjectAccessor.h" #include "CreatureAI.h" +#include "Log.h" +#include "ObjectAccessor.h" #include "ObjectDefines.h" +#include "Opcodes.h" +#include "Player.h" #include "Vehicle.h" #include "VehicleDefines.h" -#include "Player.h" -#include "Opcodes.h" +#include "WorldPacket.h" +#include "WorldSession.h" void WorldSession::HandleAttackSwingOpcode(WorldPacket& recvData) { diff --git a/src/server/game/Handlers/DuelHandler.cpp b/src/server/game/Handlers/DuelHandler.cpp index 24b124594..5bc5f5af0 100644 --- a/src/server/game/Handlers/DuelHandler.cpp +++ b/src/server/game/Handlers/DuelHandler.cpp @@ -5,12 +5,12 @@ */ #include "Common.h" -#include "WorldPacket.h" -#include "WorldSession.h" #include "Log.h" #include "Opcodes.h" -#include "UpdateData.h" #include "Player.h" +#include "UpdateData.h" +#include "WorldPacket.h" +#include "WorldSession.h" void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket) { diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 2a356f644..87a7088cf 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -6,21 +6,21 @@ #include "Common.h" #include "DatabaseEnv.h" -#include "Opcodes.h" -#include "Log.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "World.h" -#include "ObjectMgr.h" +#include "Group.h" #include "GroupMgr.h" +#include "Language.h" +#include "Log.h" +#include "ObjectMgr.h" +#include "Opcodes.h" #include "Pet.h" #include "Player.h" -#include "Group.h" #include "SocialMgr.h" -#include "Util.h" #include "SpellAuras.h" +#include "Util.h" #include "Vehicle.h" -#include "Language.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" class Aura; diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp index 3e2b7e897..97401cfc6 100644 --- a/src/server/game/Handlers/GuildHandler.cpp +++ b/src/server/game/Handlers/GuildHandler.cpp @@ -5,16 +5,16 @@ */ #include "Common.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "World.h" -#include "ObjectMgr.h" +#include "GossipDef.h" +#include "Guild.h" #include "GuildMgr.h" #include "Log.h" +#include "ObjectMgr.h" #include "Opcodes.h" -#include "Guild.h" -#include "GossipDef.h" #include "SocialMgr.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" // Cleanup bad characters void cleanStr(std::string& str) diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 2fd936f8d..1bf4c377a 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -5,16 +5,16 @@ */ #include "Common.h" +#include "Item.h" +#include "Log.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Player.h" +#include "SpellInfo.h" +#include "UpdateData.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Opcodes.h" -#include "Log.h" -#include "ObjectMgr.h" -#include "Player.h" -#include "Item.h" -#include "UpdateData.h" -#include "ObjectAccessor.h" -#include "SpellInfo.h" void WorldSession::HandleSplitItemOpcode(WorldPacket& recvData) { diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index 1e3a8d103..2e6d2f9e2 100644 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "Group.h" #include "LFGMgr.h" #include "ObjectMgr.h" -#include "Group.h" -#include "Player.h" #include "Opcodes.h" +#include "Player.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp index 932664b60..5c5151e4c 100644 --- a/src/server/game/Handlers/LootHandler.cpp +++ b/src/server/game/Handlers/LootHandler.cpp @@ -5,21 +5,21 @@ */ #include "Common.h" -#include "Log.h" #include "Corpse.h" #include "Creature.h" #include "GameObject.h" #include "Group.h" +#include "Log.h" #include "LootItemStorage.h" #include "LootMgr.h" -#include "ObjectAccessor.h" #include "Object.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" #include "Opcodes.h" #include "Player.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "ObjectMgr.h" #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index c3206c130..c6cf1ce86 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -4,19 +4,19 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "AccountMgr.h" #include "DatabaseEnv.h" -#include "Mail.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "Opcodes.h" -#include "Log.h" -#include "World.h" -#include "ObjectMgr.h" -#include "Player.h" -#include "Language.h" #include "DBCStores.h" #include "Item.h" -#include "AccountMgr.h" +#include "Language.h" +#include "Log.h" +#include "Mail.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Player.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" #define MAX_INBOX_CLIENT_CAPACITY 50 diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index c0aacc6ab..04a7048de 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -4,45 +4,45 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "Language.h" -#include "DatabaseEnv.h" -#include "WorldPacket.h" -#include "Opcodes.h" -#include "Log.h" -#include "Player.h" -#include "GossipDef.h" -#include "World.h" -#include "ObjectMgr.h" -#include "GuildMgr.h" -#include "WorldSession.h" -#include "BigNumber.h" -#include "SHA1.h" -#include "UpdateData.h" -#include "LootMgr.h" -#include "Chat.h" -#include "zlib.h" -#include "ObjectAccessor.h" -#include "Object.h" +#include "AccountMgr.h" +#include "AccountMgr.h" +#include "BattlefieldMgr.h" #include "Battleground.h" #include "BattlegroundMgr.h" -#include "BattlefieldMgr.h" +#include "BigNumber.h" +#include "CellImpl.h" +#include "Chat.h" +#include "Common.h" +#include "CreatureAI.h" +#include "DatabaseEnv.h" +#include "DBCEnums.h" +#include "GameObjectAI.h" +#include "GossipDef.h" +#include "Group.h" +#include "GuildMgr.h" +#include "InstanceScript.h" +#include "Language.h" +#include "Log.h" +#include "LootMgr.h" +#include "MapManager.h" +#include "Object.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" #include "OutdoorPvP.h" #include "Pet.h" -#include "SocialMgr.h" -#include "CellImpl.h" -#include "AccountMgr.h" -#include "Vehicle.h" -#include "CreatureAI.h" -#include "DBCEnums.h" +#include "Player.h" #include "ScriptMgr.h" -#include "MapManager.h" -#include "InstanceScript.h" -#include "GameObjectAI.h" -#include "Group.h" -#include "AccountMgr.h" +#include "SHA1.h" +#include "SocialMgr.h" #include "Spell.h" +#include "UpdateData.h" +#include "Vehicle.h" #include "WhoListCache.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" +#include "zlib.h" #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 8633bdce1..01a314317 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -4,27 +4,27 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "ArenaSpectator.h" +#include "Battleground.h" +#include "BattlegroundMgr.h" +#include "CellImpl.h" +#include "Chat.h" #include "Common.h" +#include "Corpse.h" +#include "GameGraveyard.h" +#include "InstanceSaveMgr.h" +#include "Log.h" +#include "MapManager.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Pet.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" +#include "Transport.h" +#include "WaypointMovementGenerator.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Opcodes.h" -#include "Log.h" -#include "Corpse.h" -#include "Player.h" -#include "SpellAuras.h" -#include "MapManager.h" -#include "Transport.h" -#include "Battleground.h" -#include "WaypointMovementGenerator.h" -#include "InstanceSaveMgr.h" -#include "ObjectMgr.h" -#include "CellImpl.h" -#include "Pet.h" -#include "ArenaSpectator.h" -#include "Chat.h" -#include "BattlegroundMgr.h" -#include "ScriptMgr.h" -#include "GameGraveyard.h" #define MOVEMENT_PACKET_TIME_DELAY 0 diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index 08212c136..2246867b6 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -4,28 +4,28 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "Battleground.h" +#include "BattlegroundMgr.h" #include "Common.h" -#include "Language.h" +#include "Creature.h" +#include "CreatureAI.h" #include "DatabaseEnv.h" +#include "GameGraveyard.h" +#include "GossipDef.h" +#include "Language.h" +#include "Log.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Pet.h" +#include "Player.h" +#include "ReputationMgr.h" +#include "ScriptMgr.h" +#include "SpellInfo.h" +#include "SpellMgr.h" +#include "UpdateMask.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Opcodes.h" -#include "Log.h" -#include "ObjectMgr.h" -#include "SpellMgr.h" -#include "Player.h" -#include "GossipDef.h" -#include "UpdateMask.h" -#include "ObjectAccessor.h" -#include "Creature.h" -#include "Pet.h" -#include "ReputationMgr.h" -#include "BattlegroundMgr.h" -#include "Battleground.h" -#include "ScriptMgr.h" -#include "CreatureAI.h" -#include "SpellInfo.h" -#include "GameGraveyard.h" enum StableResultCode { diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 1bec21b7c..2de3f6bf3 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -4,23 +4,23 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "Chat.h" #include "Common.h" +#include "CreatureAI.h" +#include "Group.h" +#include "Log.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Pet.h" +#include "Player.h" +#include "Spell.h" +#include "SpellInfo.h" +#include "SpellMgr.h" +#include "Util.h" +#include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "ObjectMgr.h" -#include "SpellMgr.h" -#include "Log.h" -#include "Opcodes.h" -#include "Spell.h" -#include "ObjectAccessor.h" -#include "CreatureAI.h" -#include "Util.h" -#include "Pet.h" -#include "World.h" -#include "Group.h" -#include "SpellInfo.h" -#include "Player.h" -#include "Chat.h" class LoadPetFromDBQueryHolder : public SQLQueryHolder { diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp index 36fb6d3f6..0e5fb9b60 100644 --- a/src/server/game/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Handlers/PetitionsHandler.cpp @@ -4,21 +4,21 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "ArenaTeam.h" +#include "ArenaTeamMgr.h" #include "Common.h" +#include "GossipDef.h" +#include "Guild.h" +#include "GuildMgr.h" #include "Language.h" +#include "Log.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "PetitionMgr.h" +#include "SocialMgr.h" +#include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "World.h" -#include "ObjectMgr.h" -#include "ArenaTeamMgr.h" -#include "GuildMgr.h" -#include "Log.h" -#include "Opcodes.h" -#include "Guild.h" -#include "ArenaTeam.h" -#include "GossipDef.h" -#include "SocialMgr.h" -#include "PetitionMgr.h" #define CHARTER_DISPLAY_ID 16161 diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index 9747a2b45..da38bc85a 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -5,19 +5,19 @@ */ #include "Common.h" -#include "Language.h" #include "DatabaseEnv.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "Opcodes.h" +#include "Language.h" #include "Log.h" -#include "World.h" +#include "MapManager.h" +#include "NPCHandler.h" #include "ObjectMgr.h" +#include "Opcodes.h" +#include "Pet.h" #include "Player.h" #include "UpdateMask.h" -#include "NPCHandler.h" -#include "Pet.h" -#include "MapManager.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" void WorldSession::SendNameQueryOpcode(uint64 guid) { diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index af180b4c4..ec3cd8b40 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -4,23 +4,24 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "Log.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "Opcodes.h" -#include "World.h" -#include "ObjectMgr.h" -#include "Player.h" -#include "GossipDef.h" -#include "QuestDef.h" -#include "ObjectAccessor.h" -#include "Group.h" #include "Battleground.h" #include "BattlegroundAV.h" -#include "ScriptMgr.h" +#include "Common.h" #include "GameObjectAI.h" +#include "GossipDef.h" +#include "Group.h" #include "Language.h" +#include "Log.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Player.h" +#include "QuestDef.h" +#include "ScriptMgr.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" + #ifdef ELUNA #include "LuaEngine.h" #endif diff --git a/src/server/game/Handlers/ReferAFriendHandler.cpp b/src/server/game/Handlers/ReferAFriendHandler.cpp index a93bc2649..7c0f8fb32 100644 --- a/src/server/game/Handlers/ReferAFriendHandler.cpp +++ b/src/server/game/Handlers/ReferAFriendHandler.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "WorldSession.h" -#include "Player.h" +#include "Log.h" #include "ObjectMgr.h" #include "Opcodes.h" -#include "Log.h" +#include "Player.h" +#include "WorldSession.h" void WorldSession::HandleGrantLevel(WorldPacket& recvData) { diff --git a/src/server/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp index 72b02cb6e..38636ae99 100644 --- a/src/server/game/Handlers/SkillHandler.cpp +++ b/src/server/game/Handlers/SkillHandler.cpp @@ -9,8 +9,8 @@ #include "Log.h" #include "ObjectAccessor.h" #include "Opcodes.h" -#include "Player.h" #include "Pet.h" +#include "Player.h" #include "UpdateMask.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Handlers/Socialhandler.cpp b/src/server/game/Handlers/Socialhandler.cpp index bb1b0dedc..878229ccc 100644 --- a/src/server/game/Handlers/Socialhandler.cpp +++ b/src/server/game/Handlers/Socialhandler.cpp @@ -4,15 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "WorldSession.h" #include "AccountMgr.h" -#include "Log.h" #include "Language.h" +#include "Log.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" #include "SocialMgr.h" #include "World.h" +#include "WorldSession.h" void WorldSession::HandleContactListOpcode(WorldPacket& recv_data) { diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index 593b9c00c..4c0f56fac 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -5,23 +5,24 @@ */ #include "Common.h" +#include "CreatureAI.h" #include "DBCStores.h" +#include "GameObjectAI.h" +#include "Log.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "Spell.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellMgr.h" +#include "TemporarySummon.h" +#include "Totem.h" +#include "Vehicle.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "ObjectMgr.h" -#include "SpellMgr.h" -#include "Log.h" -#include "Opcodes.h" -#include "Spell.h" -#include "Vehicle.h" -#include "Totem.h" -#include "TemporarySummon.h" -#include "SpellAuras.h" -#include "CreatureAI.h" -#include "ScriptMgr.h" -#include "GameObjectAI.h" -#include "SpellAuraEffects.h" -#include "Player.h" + #ifdef ELUNA #include "LuaEngine.h" #endif diff --git a/src/server/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp index e8d6b9aed..1b9abec32 100644 --- a/src/server/game/Handlers/TaxiHandler.cpp +++ b/src/server/game/Handlers/TaxiHandler.cpp @@ -6,14 +6,14 @@ #include "Common.h" #include "DatabaseEnv.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "Opcodes.h" #include "Log.h" #include "ObjectMgr.h" +#include "Opcodes.h" #include "Player.h" #include "UpdateMask.h" #include "WaypointMovementGenerator.h" +#include "WorldPacket.h" +#include "WorldSession.h" void WorldSession::HandleTaxiNodeStatusQueryOpcode(WorldPacket& recvData) { diff --git a/src/server/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp index c1f16162b..baea91bb1 100644 --- a/src/server/game/Handlers/TicketHandler.cpp +++ b/src/server/game/Handlers/TicketHandler.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "zlib.h" +#include "Chat.h" #include "Common.h" #include "Language.h" #include "ObjectMgr.h" @@ -14,8 +14,8 @@ #include "Util.h" #include "World.h" #include "WorldPacket.h" -#include "Chat.h" #include "WorldSession.h" +#include "zlib.h" void WorldSession::HandleGMTicketCreateOpcode(WorldPacket& recvData) { diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index 510698f09..537e52ddd 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -4,19 +4,19 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "AccountMgr.h" #include "Common.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "World.h" -#include "ObjectAccessor.h" +#include "Item.h" +#include "Language.h" #include "Log.h" +#include "ObjectAccessor.h" #include "Opcodes.h" #include "Player.h" -#include "Item.h" -#include "Spell.h" #include "SocialMgr.h" -#include "Language.h" -#include "AccountMgr.h" +#include "Spell.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" void WorldSession::SendTradeStatus(TradeStatus status) { diff --git a/src/server/game/Handlers/VehicleHandler.cpp b/src/server/game/Handlers/VehicleHandler.cpp index faa2ae69d..df9a0ab73 100644 --- a/src/server/game/Handlers/VehicleHandler.cpp +++ b/src/server/game/Handlers/VehicleHandler.cpp @@ -4,13 +4,13 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "WorldPacket.h" -#include "WorldSession.h" -#include "Opcodes.h" -#include "Vehicle.h" -#include "Player.h" #include "Log.h" #include "ObjectAccessor.h" +#include "Opcodes.h" +#include "Player.h" +#include "Vehicle.h" +#include "WorldPacket.h" +#include "WorldSession.h" void WorldSession::HandleDismissControlledVehicle(WorldPacket& recvData) { diff --git a/src/server/game/Handlers/VoiceChatHandler.cpp b/src/server/game/Handlers/VoiceChatHandler.cpp index ca11053ef..6cf648386 100644 --- a/src/server/game/Handlers/VoiceChatHandler.cpp +++ b/src/server/game/Handlers/VoiceChatHandler.cpp @@ -5,10 +5,10 @@ */ #include "Common.h" +#include "Log.h" +#include "Opcodes.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Opcodes.h" -#include "Log.h" void WorldSession::HandleVoiceSessionEnableOpcode(WorldPacket& recvData) { diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index b6c4729a8..08e34461a 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -4,24 +4,24 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "Player.h" -#include "GridNotifiers.h" -#include "Log.h" #include "CellImpl.h" -#include "Map.h" -#include "MapManager.h" -#include "MapInstanced.h" -#include "InstanceSaveMgr.h" -#include "Timer.h" -#include "GridNotifiersImpl.h" +#include "Common.h" #include "Config.h" -#include "Transport.h" -#include "ObjectMgr.h" -#include "World.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "Group.h" +#include "InstanceSaveMgr.h" #include "InstanceScript.h" +#include "Log.h" +#include "Map.h" +#include "MapInstanced.h" +#include "MapManager.h" +#include "ObjectMgr.h" +#include "Player.h" #include "ScriptMgr.h" +#include "Timer.h" +#include "Transport.h" +#include "World.h" uint16 InstanceSaveManager::ResetTimeDelay[] = {3600, 900, 300, 60, 0}; PlayerBindStorage InstanceSaveManager::playerBindStorage; diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index 0b27080e6..8dd0e36af 100644 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -7,11 +7,10 @@ #ifndef _INSTANCESAVEMGR_H #define _INSTANCESAVEMGR_H -#include "Define.h" #include "DatabaseEnv.h" #include "DBCEnums.h" +#include "Define.h" #include "ObjectDefines.h" - #include #include #include diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 8d160bf2f..cf5b51720 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -13,11 +13,11 @@ #include "LFGMgr.h" #include "Log.h" #include "Map.h" -#include "Player.h" -#include "Pet.h" -#include "WorldSession.h" #include "Opcodes.h" +#include "Pet.h" +#include "Player.h" #include "Spell.h" +#include "WorldSession.h" void InstanceScript::SaveToDB() { diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index 9810940af..6f4117d1f 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -7,11 +7,11 @@ #ifndef ACORE_INSTANCE_DATA_H #define ACORE_INSTANCE_DATA_H -#include "ZoneScript.h" -#include "World.h" -#include "ObjectMgr.h" //#include "GameObject.h" //#include "Map.h" +#include "ObjectMgr.h" +#include "World.h" +#include "ZoneScript.h" #define OUT_SAVE_INST_DATA sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d)", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) #define OUT_SAVE_INST_DATA_COMPLETE sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Saving Instance Data for Instance %s (Map %d, Instance Id %d) completed.", instance->GetMapName(), instance->GetId(), instance->GetInstanceId()) diff --git a/src/server/game/Loot/LootItemStorage.cpp b/src/server/game/Loot/LootItemStorage.cpp index 3e4f67db8..6efcb2ce9 100644 --- a/src/server/game/Loot/LootItemStorage.cpp +++ b/src/server/game/Loot/LootItemStorage.cpp @@ -2,11 +2,10 @@ Xinef */ -#include - #include "LootItemStorage.h" -#include "PreparedStatement.h" #include "ObjectMgr.h" +#include "PreparedStatement.h" +#include LootItemStorage::LootItemStorage() { diff --git a/src/server/game/Loot/LootItemStorage.h b/src/server/game/Loot/LootItemStorage.h index d708a1b15..a05f0237d 100644 --- a/src/server/game/Loot/LootItemStorage.h +++ b/src/server/game/Loot/LootItemStorage.h @@ -6,10 +6,10 @@ Xinef #define ACORE_LOOTITEMSTORAGE_H #include "Common.h" -#include "LootMgr.h" #include "Item.h" -#include +#include "LootMgr.h" #include +#include struct StoredLootItem { diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 487d0f997..e1005aa59 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -4,18 +4,18 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "LootMgr.h" -#include "Log.h" -#include "ObjectMgr.h" -#include "World.h" -#include "Util.h" -#include "SharedDefines.h" -#include "SpellMgr.h" -#include "SpellInfo.h" -#include "Group.h" -#include "Player.h" #include "Containers.h" +#include "Group.h" +#include "Log.h" +#include "LootMgr.h" +#include "ObjectMgr.h" +#include "Player.h" #include "ScriptMgr.h" +#include "SharedDefines.h" +#include "SpellInfo.h" +#include "SpellMgr.h" +#include "Util.h" +#include "World.h" static Rates const qualityToRate[MAX_ITEM_QUALITY] = { diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index d18f32753..bffa77865 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -7,15 +7,14 @@ #ifndef ACORE_LOOTMGR_H #define ACORE_LOOTMGR_H -#include "ItemEnchantmentMgr.h" #include "ByteBuffer.h" +#include "ConditionMgr.h" +#include "ItemEnchantmentMgr.h" #include "RefManager.h" #include "SharedDefines.h" -#include "ConditionMgr.h" - +#include #include #include -#include enum RollType { diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index d4c949ac5..b7ec360f7 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -4,18 +4,18 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "AuctionHouseMgr.h" +#include "BattlegroundMgr.h" +#include "CalendarMgr.h" #include "DatabaseEnv.h" -#include "Mail.h" +#include "Item.h" #include "Log.h" -#include "World.h" +#include "Mail.h" #include "ObjectMgr.h" #include "Player.h" -#include "Unit.h" -#include "BattlegroundMgr.h" -#include "Item.h" -#include "AuctionHouseMgr.h" -#include "CalendarMgr.h" #include "ScriptMgr.h" +#include "Unit.h" +#include "World.h" MailSender::MailSender(Object* sender, MailStationery stationery) : m_stationery(stationery) { diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 6d55c7949..cf1ef0809 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -4,17 +4,19 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Map.h" -#include "Geometry.h" #include "Battleground.h" #include "CellImpl.h" +#include "Chat.h" #include "DynamicTree.h" +#include "Geometry.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "Object.h" #include "Group.h" #include "InstanceScript.h" +#include "LFGMgr.h" +#include "Map.h" #include "MapInstanced.h" +#include "Object.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Pet.h" @@ -22,8 +24,7 @@ #include "Transport.h" #include "Vehicle.h" #include "VMapFactory.h" -#include "LFGMgr.h" -#include "Chat.h" + #ifdef ELUNA #include "LuaEngine.h" #endif diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 8d6c68606..4c205b6ad 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -7,22 +7,21 @@ #ifndef ACORE_MAP_H #define ACORE_MAP_H -#include "Define.h" -#include -#include - -#include "DBCStructure.h" -#include "GridDefines.h" #include "Cell.h" -#include "Timer.h" -#include "SharedDefines.h" -#include "GridRefManager.h" -#include "MapRefManager.h" +#include "DataMap.h" +#include "DBCStructure.h" +#include "Define.h" #include "DynamicTree.h" #include "GameObjectModel.h" -#include "PathGenerator.h" +#include "GridDefines.h" +#include "GridRefManager.h" +#include "MapRefManager.h" #include "ObjectDefines.h" -#include "DataMap.h" +#include "PathGenerator.h" +#include "SharedDefines.h" +#include "Timer.h" +#include +#include #include #include diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp index c73286402..a793e1ea0 100644 --- a/src/server/game/Maps/MapInstanced.cpp +++ b/src/server/game/Maps/MapInstanced.cpp @@ -4,16 +4,16 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "MapInstanced.h" -#include "ObjectMgr.h" -#include "MapManager.h" #include "Battleground.h" -#include "VMapFactory.h" -#include "MMapFactory.h" -#include "InstanceSaveMgr.h" -#include "World.h" #include "Group.h" +#include "InstanceSaveMgr.h" +#include "MapInstanced.h" +#include "MapManager.h" +#include "MMapFactory.h" +#include "ObjectMgr.h" #include "Player.h" +#include "VMapFactory.h" +#include "World.h" #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h index a09418d3e..ea06206d6 100644 --- a/src/server/game/Maps/MapInstanced.h +++ b/src/server/game/Maps/MapInstanced.h @@ -7,9 +7,9 @@ #ifndef ACORE_MAP_INSTANCED_H #define ACORE_MAP_INSTANCED_H -#include "Map.h" -#include "InstanceSaveMgr.h" #include "DBCEnums.h" +#include "InstanceSaveMgr.h" +#include "Map.h" class MapInstanced : public Map { diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 785f22116..3bf8bd024 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -4,29 +4,30 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "MapManager.h" -#include "InstanceSaveMgr.h" -#include "DatabaseEnv.h" -#include "Log.h" -#include "ObjectAccessor.h" -#include "Transport.h" -#include "GridDefines.h" -#include "MapInstanced.h" -#include "InstanceScript.h" -#include "Config.h" -#include "World.h" -#include "CellImpl.h" -#include "Corpse.h" -#include "ObjectMgr.h" -#include "Language.h" -#include "WorldPacket.h" -#include "Group.h" -#include "Player.h" -#include "WorldSession.h" -#include "Opcodes.h" -#include "LFGMgr.h" -#include "Chat.h" #include "AvgDiffTracker.h" +#include "CellImpl.h" +#include "Chat.h" +#include "Config.h" +#include "Corpse.h" +#include "DatabaseEnv.h" +#include "GridDefines.h" +#include "Group.h" +#include "InstanceSaveMgr.h" +#include "InstanceScript.h" +#include "Language.h" +#include "LFGMgr.h" +#include "Log.h" +#include "MapInstanced.h" +#include "MapManager.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Player.h" +#include "Transport.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" + #ifdef ELUNA #include "LuaEngine.h" #endif diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h index a19059bcd..6ce03670f 100644 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapManager.h @@ -7,12 +7,12 @@ #ifndef ACORE_MAPMANAGER_H #define ACORE_MAPMANAGER_H -#include "Define.h" -#include #include "Common.h" +#include "Define.h" #include "Map.h" -#include "Object.h" #include "MapUpdater.h" +#include "Object.h" +#include class Transport; class StaticTransport; diff --git a/src/server/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h index 620c81fee..27600a26e 100644 --- a/src/server/game/Maps/MapReference.h +++ b/src/server/game/Maps/MapReference.h @@ -7,8 +7,8 @@ #ifndef _MAPREFERENCE_H #define _MAPREFERENCE_H -#include "Reference.h" #include "Map.h" +#include "Reference.h" class MapReference : public Reference { diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp index 19974f4ed..c5b9726fb 100644 --- a/src/server/game/Maps/MapUpdater.cpp +++ b/src/server/game/Maps/MapUpdater.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "MapUpdater.h" -#include "Map.h" -#include "LFGMgr.h" #include "AvgDiffTracker.h" +#include "LFGMgr.h" +#include "Map.h" +#include "MapUpdater.h" class UpdateRequest { diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp index 901243c1c..31183ae55 100644 --- a/src/server/game/Maps/TransportMgr.cpp +++ b/src/server/game/Maps/TransportMgr.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "TransportMgr.h" -#include "Transport.h" #include "InstanceScript.h" -#include "MoveSpline.h" #include "MapManager.h" +#include "MoveSpline.h" +#include "Transport.h" +#include "TransportMgr.h" TransportTemplate::~TransportTemplate() { diff --git a/src/server/game/Maps/TransportMgr.h b/src/server/game/Maps/TransportMgr.h index 0296a104e..e195c3e69 100644 --- a/src/server/game/Maps/TransportMgr.h +++ b/src/server/game/Maps/TransportMgr.h @@ -7,9 +7,9 @@ #ifndef TRANSPORTMGR_H #define TRANSPORTMGR_H -#include -#include "Spline.h" #include "DBCStores.h" +#include "Spline.h" +#include struct KeyFrame; struct GameObjectTemplate; diff --git a/src/server/game/Misc/AsyncAuctionListing.cpp b/src/server/game/Misc/AsyncAuctionListing.cpp index b0d148879..73e5eb237 100644 --- a/src/server/game/Misc/AsyncAuctionListing.cpp +++ b/src/server/game/Misc/AsyncAuctionListing.cpp @@ -1,9 +1,9 @@ #include "AsyncAuctionListing.h" -#include "Player.h" -#include "Creature.h" #include "AuctionHouseMgr.h" +#include "Creature.h" #include "ObjectAccessor.h" #include "Opcodes.h" +#include "Player.h" #include "SpellAuraEffects.h" uint32 AsyncAuctionListingMgr::auctionListingDiff = 0; diff --git a/src/server/game/Misc/BanManager.cpp b/src/server/game/Misc/BanManager.cpp index ee5d7b4a4..2ebe2e6b1 100644 --- a/src/server/game/Misc/BanManager.cpp +++ b/src/server/game/Misc/BanManager.cpp @@ -2,13 +2,13 @@ * Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "BanManager.h" #include "AccountMgr.h" +#include "BanManager.h" #include "DatabaseEnv.h" +#include "Language.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" -#include "Language.h" #include "ScriptMgr.h" #include "World.h" #include "WorldSession.h" diff --git a/src/server/game/Misc/GameGraveyard.cpp b/src/server/game/Misc/GameGraveyard.cpp index ddb9c41f3..b83153b7b 100644 --- a/src/server/game/Misc/GameGraveyard.cpp +++ b/src/server/game/Misc/GameGraveyard.cpp @@ -1,8 +1,8 @@ -#include "GameGraveyard.h" -#include "MapManager.h" -#include "DBCStores.h" #include "DatabaseEnv.h" +#include "DBCStores.h" +#include "GameGraveyard.h" #include "Log.h" +#include "MapManager.h" Graveyard* Graveyard::instance() { diff --git a/src/server/game/Misc/WhoListCache.cpp b/src/server/game/Misc/WhoListCache.cpp index e381b21eb..f857ac3b7 100644 --- a/src/server/game/Misc/WhoListCache.cpp +++ b/src/server/game/Misc/WhoListCache.cpp @@ -1,8 +1,8 @@ -#include "WhoListCache.h" -#include "World.h" +#include "GuildMgr.h" #include "ObjectAccessor.h" #include "Player.h" -#include "GuildMgr.h" +#include "WhoListCache.h" +#include "World.h" std::vector WhoListCacheMgr::m_whoOpcodeList; diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h index 9d9291430..fbd4d3a71 100644 --- a/src/server/game/Miscellaneous/Formulas.h +++ b/src/server/game/Miscellaneous/Formulas.h @@ -7,11 +7,11 @@ #ifndef ACORE_FORMULAS_H #define ACORE_FORMULAS_H -#include "World.h" -#include "SharedDefines.h" -#include "ScriptMgr.h" -#include "Player.h" #include "Creature.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "SharedDefines.h" +#include "World.h" namespace acore { diff --git a/src/server/game/Motd/ServerMotd.cpp b/src/server/game/Motd/ServerMotd.cpp index c1ec458b8..d943cf46d 100644 --- a/src/server/game/Motd/ServerMotd.cpp +++ b/src/server/game/Motd/ServerMotd.cpp @@ -3,10 +3,10 @@ * Copyright (C) 2008-2016 TrinityCore */ -#include "ServerMotd.h" #include "Common.h" -#include "ScriptMgr.h" #include "Opcodes.h" +#include "ScriptMgr.h" +#include "ServerMotd.h" #include "Util.h" #include "WorldPacket.h" #include diff --git a/src/server/game/Movement/FollowerReference.cpp b/src/server/game/Movement/FollowerReference.cpp index ab0471806..8136fe6ae 100644 --- a/src/server/game/Movement/FollowerReference.cpp +++ b/src/server/game/Movement/FollowerReference.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Unit.h" -#include "TargetedMovementGenerator.h" #include "FollowerReference.h" +#include "TargetedMovementGenerator.h" +#include "Unit.h" void FollowerReference::targetObjectBuildLink() { diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 3a26851a8..e2f75f405 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -4,24 +4,22 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "MotionMaster.h" -#include "CreatureAISelector.h" -#include "Creature.h" - #include "ConfusedMovementGenerator.h" +#include "Creature.h" +#include "CreatureAISelector.h" +#include "EscortMovementGenerator.h" #include "FleeingMovementGenerator.h" #include "HomeMovementGenerator.h" #include "IdleMovementGenerator.h" -#include "PointMovementGenerator.h" -#include "TargetedMovementGenerator.h" -#include "WaypointMovementGenerator.h" -#include "RandomMovementGenerator.h" -#include "EscortMovementGenerator.h" +#include "MotionMaster.h" #include "MoveSpline.h" #include "MoveSplineInit.h" +#include "PointMovementGenerator.h" +#include "RandomMovementGenerator.h" +#include "TargetedMovementGenerator.h" +#include "WaypointMovementGenerator.h" #include - // ---- ChaseRange ---- // ChaseRange::ChaseRange(float range) : MinRange(range > CONTACT_DISTANCE ? 0 : range - CONTACT_DISTANCE), MinTolerance(range), MaxRange(range + CONTACT_DISTANCE), MaxTolerance(range) { } diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index f006c26ee..9073abcef 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -8,11 +8,11 @@ #define ACORE_MOTIONMASTER_H #include "Common.h" -#include -#include "SharedDefines.h" #include "Object.h" +#include "SharedDefines.h" #include "Spline/MoveSpline.h" #include +#include class MovementGenerator; class Unit; diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h index adb4bea85..d2db13103 100644 --- a/src/server/game/Movement/MovementGenerator.h +++ b/src/server/game/Movement/MovementGenerator.h @@ -7,11 +7,11 @@ #ifndef ACORE_MOVEMENTGENERATOR_H #define ACORE_MOVEMENTGENERATOR_H -#include "Define.h" -#include "ObjectRegistry.h" -#include "FactoryHolder.h" #include "Common.h" +#include "Define.h" +#include "FactoryHolder.h" #include "MotionMaster.h" +#include "ObjectRegistry.h" class Unit; diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp index 5fea29249..359e6bfd0 100644 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp @@ -4,13 +4,13 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "ConfusedMovementGenerator.h" #include "Creature.h" #include "MapManager.h" -#include "ConfusedMovementGenerator.h" -#include "VMapFactory.h" -#include "MoveSplineInit.h" #include "MoveSpline.h" +#include "MoveSplineInit.h" #include "Player.h" +#include "VMapFactory.h" #ifdef MAP_BASED_RAND_GEN #define rand_norm() unit.rand_norm() diff --git a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp index 3da7fe555..b9a214a22 100644 --- a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp @@ -2,14 +2,14 @@ Written by Xinef */ -#include "EscortMovementGenerator.h" -#include "Errors.h" #include "Creature.h" #include "CreatureAI.h" -#include "World.h" -#include "MoveSplineInit.h" +#include "Errors.h" +#include "EscortMovementGenerator.h" #include "MoveSpline.h" +#include "MoveSplineInit.h" #include "Player.h" +#include "World.h" template void EscortMovementGenerator::DoInitialize(T* unit) diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index 91128005f..86ef07a0d 100644 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -6,11 +6,11 @@ #include "Creature.h" #include "CreatureAI.h" -#include "MapManager.h" #include "FleeingMovementGenerator.h" -#include "ObjectAccessor.h" -#include "MoveSplineInit.h" +#include "MapManager.h" #include "MoveSpline.h" +#include "MoveSplineInit.h" +#include "ObjectAccessor.h" #include "Player.h" #include "VMapFactory.h" diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp index 7adfb5a7f..00587e314 100644 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "HomeMovementGenerator.h" #include "Creature.h" #include "CreatureAI.h" -#include "WorldPacket.h" -#include "MoveSplineInit.h" +#include "HomeMovementGenerator.h" #include "MoveSpline.h" +#include "MoveSplineInit.h" +#include "WorldPacket.h" void HomeMovementGenerator::DoInitialize(Creature* owner) { diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp index 5469bcd7a..e767041c6 100644 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "IdleMovementGenerator.h" -#include "CreatureAI.h" #include "Creature.h" +#include "CreatureAI.h" +#include "IdleMovementGenerator.h" IdleMovementGenerator si_idleMovement; diff --git a/src/server/game/Movement/MovementGenerators/PathGenerator.cpp b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp index 84ea32beb..4ab95dbe6 100644 --- a/src/server/game/Movement/MovementGenerators/PathGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp @@ -4,15 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "PathGenerator.h" -#include "Map.h" #include "Creature.h" +#include "DetourCommon.h" +#include "DisableMgr.h" +#include "Geometry.h" +#include "Log.h" +#include "Map.h" #include "MMapFactory.h" #include "MMapManager.h" -#include "Log.h" -#include "DisableMgr.h" -#include "DetourCommon.h" -#include "Geometry.h" +#include "PathGenerator.h" ////////////////// PathGenerator ////////////////// PathGenerator::PathGenerator(WorldObject const* owner) : diff --git a/src/server/game/Movement/MovementGenerators/PathGenerator.h b/src/server/game/Movement/MovementGenerators/PathGenerator.h index 1adea54ac..d65b72723 100644 --- a/src/server/game/Movement/MovementGenerators/PathGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PathGenerator.h @@ -7,13 +7,13 @@ #ifndef _PATH_GENERATOR_H #define _PATH_GENERATOR_H -#include "SharedDefines.h" #include "DetourNavMesh.h" #include "DetourNavMeshQuery.h" -#include "MoveSplineInitArgs.h" -#include #include "MMapFactory.h" #include "MMapManager.h" +#include "MoveSplineInitArgs.h" +#include "SharedDefines.h" +#include class Unit; class WorldObject; diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp index 4bc9d5ba7..d89de31fc 100644 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp @@ -4,14 +4,14 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "PointMovementGenerator.h" -#include "Errors.h" #include "Creature.h" #include "CreatureAI.h" -#include "World.h" -#include "MoveSplineInit.h" +#include "Errors.h" #include "MoveSpline.h" +#include "MoveSplineInit.h" #include "Player.h" +#include "PointMovementGenerator.h" +#include "World.h" //----- Point Movement Generator template diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h index 29f68b8d4..e7175f2e9 100644 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h @@ -7,8 +7,8 @@ #ifndef ACORE_POINTMOVEMENTGENERATOR_H #define ACORE_POINTMOVEMENTGENERATOR_H -#include "MovementGenerator.h" #include "FollowerReference.h" +#include "MovementGenerator.h" template class PointMovementGenerator : public MovementGeneratorMedium< T, PointMovementGenerator > diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index 7dafdfcb9..967f46c31 100644 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -3,15 +3,15 @@ */ #include "Creature.h" -#include "MapManager.h" -#include "RandomMovementGenerator.h" -#include "ObjectAccessor.h" -#include "Map.h" -#include "Util.h" #include "CreatureGroups.h" -#include "MoveSplineInit.h" +#include "Map.h" +#include "MapManager.h" #include "MoveSpline.h" +#include "MoveSplineInit.h" +#include "ObjectAccessor.h" +#include "RandomMovementGenerator.h" #include "Spell.h" +#include "Util.h" template<> void RandomMovementGenerator::_setRandomLocation(Creature* creature) diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index 54da580d7..8dd91e0fd 100644 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -4,14 +4,14 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "TargetedMovementGenerator.h" #include "Creature.h" #include "CreatureAI.h" #include "MoveSplineInit.h" +#include "Pet.h" #include "Player.h" #include "Spell.h" +#include "TargetedMovementGenerator.h" #include "Transport.h" -#include "Pet.h" static bool IsMutualChase(Unit* owner, Unit* target) { diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h index fa928165c..27a0d5b8c 100644 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h @@ -7,11 +7,11 @@ #ifndef ACORE_TARGETEDMOVEMENTGENERATOR_H #define ACORE_TARGETEDMOVEMENTGENERATOR_H -#include "MovementGenerator.h" #include "FollowerReference.h" +#include "MovementGenerator.h" +#include "PathGenerator.h" #include "Timer.h" #include "Unit.h" -#include "PathGenerator.h" #include class TargetedMovementGeneratorBase diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index db9b6317d..f4f1793d3 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -3,23 +3,19 @@ * Copyright (C) 2008-2016 TrinityCore * Copyright (C) 2005-2009 MaNGOS */ -//Basic headers -#include "WaypointMovementGenerator.h" -//Extended headers -#include "ObjectMgr.h" -#include "World.h" -#include "Transport.h" -//Flightmaster grid preloading -#include "MapManager.h" -//Creature-specific headers + #include "Creature.h" #include "CreatureAI.h" #include "CreatureGroups.h" -//Player-specific -#include "Player.h" -#include "MoveSplineInit.h" +#include "MapManager.h" #include "MoveSpline.h" +#include "MoveSplineInit.h" +#include "ObjectMgr.h" +#include "Player.h" #include "Spell.h" +#include "Transport.h" +#include "WaypointMovementGenerator.h" +#include "World.h" void WaypointMovementGenerator::LoadPath(Creature* creature) { diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index 4ad5d684e..35e6f4a32 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -14,9 +14,8 @@ */ #include "MovementGenerator.h" -#include "WaypointManager.h" - #include "Player.h" +#include "WaypointManager.h" #define FLIGHT_TRAVEL_UPDATE 100 #define TIMEDIFF_NEXT_WP 250 diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index 96835faad..96162743e 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "Creature.h" +#include "Log.h" #include "MoveSpline.h" #include -#include "Log.h" -#include "Creature.h" namespace Movement { diff --git a/src/server/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h index c344d649d..9ebfe38f5 100644 --- a/src/server/game/Movement/Spline/MoveSpline.h +++ b/src/server/game/Movement/Spline/MoveSpline.h @@ -7,8 +7,8 @@ #ifndef TRINITYSERVER_MOVEPLINE_H #define TRINITYSERVER_MOVEPLINE_H -#include "Spline.h" #include "MoveSplineInitArgs.h" +#include "Spline.h" namespace Movement { diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h index 994277e5c..2794cb008 100644 --- a/src/server/game/Movement/Spline/MoveSplineFlag.h +++ b/src/server/game/Movement/Spline/MoveSplineFlag.h @@ -6,8 +6,8 @@ #ifndef TRINITYSERVER_MOVESPLINEFLAG_H #define TRINITYSERVER_MOVESPLINEFLAG_H -#include "MovementTypedefs.h" +#include "MovementTypedefs.h" #include namespace Movement diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index 686e0b0e6..bdf764836 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -4,14 +4,14 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "MoveSplineInit.h" -#include "MoveSpline.h" #include "MovementPacketBuilder.h" -#include "Unit.h" +#include "MoveSpline.h" +#include "MoveSplineInit.h" +#include "Opcodes.h" #include "Transport.h" +#include "Unit.h" #include "Vehicle.h" #include "WorldPacket.h" -#include "Opcodes.h" namespace Movement { diff --git a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp index 667ecb14e..268a40942 100644 --- a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp +++ b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "ByteBuffer.h" #include "MovementPacketBuilder.h" #include "MoveSpline.h" -#include "ByteBuffer.h" namespace Movement { diff --git a/src/server/game/Movement/Spline/Spline.cpp b/src/server/game/Movement/Spline/Spline.cpp index d8750632b..208048d52 100644 --- a/src/server/game/Movement/Spline/Spline.cpp +++ b/src/server/game/Movement/Spline/Spline.cpp @@ -5,8 +5,8 @@ */ #include "Spline.h" -#include #include +#include namespace Movement { diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp index b1cd73c62..339177ea5 100644 --- a/src/server/game/Movement/Waypoints/WaypointManager.cpp +++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp @@ -6,9 +6,9 @@ #include "DatabaseEnv.h" #include "GridDefines.h" -#include "WaypointManager.h" -#include "MapManager.h" #include "Log.h" +#include "MapManager.h" +#include "WaypointManager.h" WaypointMgr::WaypointMgr() { diff --git a/src/server/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h index 9b13d221b..6ec071caf 100644 --- a/src/server/game/Movement/Waypoints/WaypointManager.h +++ b/src/server/game/Movement/Waypoints/WaypointManager.h @@ -8,8 +8,8 @@ #define ACORE_WAYPOINTMANAGER_H #include "Common.h" -#include #include +#include enum WaypointMoveType { diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index f95705e25..65c5df21c 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -4,19 +4,19 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "OutdoorPvP.h" -#include "OutdoorPvPMgr.h" -#include "ObjectAccessor.h" -#include "ObjectMgr.h" +#include "CellImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "GridNotifiersImpl.h" +#include "Group.h" #include "Map.h" #include "MapManager.h" -#include "Group.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "OutdoorPvP.h" +#include "OutdoorPvPMgr.h" #include "WorldPacket.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" -#include "CellImpl.h" OPvPCapturePoint::OPvPCapturePoint(OutdoorPvP* pvp): m_capturePointGUID(0), m_capturePoint(nullptr), m_maxValue(0.0f), m_minValue(0.0f), m_maxSpeed(0), diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h index 5e02a721b..bd998b1d5 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.h +++ b/src/server/game/OutdoorPvP/OutdoorPvP.h @@ -7,8 +7,8 @@ #ifndef OUTDOOR_PVP_H_ #define OUTDOOR_PVP_H_ -#include "Util.h" #include "SharedDefines.h" +#include "Util.h" #include "ZoneScript.h" class GameObject; diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp index 67391fba1..ff317f825 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "OutdoorPvPMgr.h" -#include "ObjectMgr.h" -#include "Player.h" #include "DisableMgr.h" +#include "ObjectMgr.h" +#include "OutdoorPvPMgr.h" +#include "Player.h" #include "ScriptMgr.h" OutdoorPvPMgr::OutdoorPvPMgr() diff --git a/src/server/game/Petitions/PetitionMgr.cpp b/src/server/game/Petitions/PetitionMgr.cpp index 07984aa46..432c9eacb 100644 --- a/src/server/game/Petitions/PetitionMgr.cpp +++ b/src/server/game/Petitions/PetitionMgr.cpp @@ -2,11 +2,11 @@ Xinef */ -#include "PetitionMgr.h" -#include "Timer.h" -#include "QueryResult.h" -#include "Log.h" #include "DatabaseEnv.h" +#include "Log.h" +#include "PetitionMgr.h" +#include "QueryResult.h" +#include "Timer.h" PetitionMgr::PetitionMgr() { diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index af378a058..62361981e 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "PoolMgr.h" #include "Containers.h" -#include "ObjectMgr.h" #include "Log.h" #include "MapManager.h" +#include "ObjectMgr.h" +#include "PoolMgr.h" #include "Transport.h" //////////////////////////////////////////////////////////// diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h index 11ea7f6d9..59b6d5b8a 100644 --- a/src/server/game/Pools/PoolMgr.h +++ b/src/server/game/Pools/PoolMgr.h @@ -7,8 +7,8 @@ #ifndef ACORE_POOLHANDLER_H #define ACORE_POOLHANDLER_H -#include "Define.h" #include "Creature.h" +#include "Define.h" #include "GameObject.h" #include "QuestDef.h" diff --git a/src/server/game/PrecompiledHeaders/gamePCH.h b/src/server/game/PrecompiledHeaders/gamePCH.h index 68f628430..824069bf5 100644 --- a/src/server/game/PrecompiledHeaders/gamePCH.h +++ b/src/server/game/PrecompiledHeaders/gamePCH.h @@ -3,11 +3,10 @@ #include "WorldSocket.h" // must be first to make ACE happy with ACE includes in it #include "Common.h" - -#include "MapManager.h" #include "Log.h" +#include "MapManager.h" #include "ObjectAccessor.h" #include "ObjectDefines.h" +#include "ObjectMgr.h" #include "Opcodes.h" #include "SharedDefines.h" -#include "ObjectMgr.h" diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 7daab8261..1c535a9a9 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "QuestDef.h" -#include "Player.h" -#include "World.h" -#include "Opcodes.h" #include "Formulas.h" +#include "Opcodes.h" +#include "Player.h" +#include "QuestDef.h" +#include "World.h" Quest::Quest(Field* questRecord) { diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index f2e4ae4c8..74e7aa571 100644 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -7,12 +7,11 @@ #ifndef AZEROTHCORE_QUEST_H #define AZEROTHCORE_QUEST_H -#include "Define.h" #include "DatabaseEnv.h" +#include "DBCEnums.h" +#include "Define.h" #include "SharedDefines.h" #include "WorldPacket.h" -#include "DBCEnums.h" - #include #include diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp index a0168fbdf..dff415030 100644 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -5,13 +5,13 @@ */ #include "DatabaseEnv.h" -#include "ReputationMgr.h" #include "DBCStores.h" -#include "Player.h" -#include "WorldPacket.h" -#include "World.h" #include "ObjectMgr.h" +#include "Player.h" +#include "ReputationMgr.h" #include "ScriptMgr.h" +#include "World.h" +#include "WorldPacket.h" #include "WorldSession.h" const int32 ReputationMgr::PointsInRank[MAX_REPUTATION_RANK] = {36000, 3000, 3000, 3000, 6000, 12000, 21000, 1000}; diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h index fd623bd37..2e229738f 100644 --- a/src/server/game/Reputation/ReputationMgr.h +++ b/src/server/game/Reputation/ReputationMgr.h @@ -8,10 +8,10 @@ #define __ACORE_REPUTATION_MGR_H #include "Common.h" -#include "SharedDefines.h" -#include "Language.h" #include "DBCStructure.h" +#include "Language.h" #include "QueryResult.h" +#include "SharedDefines.h" #include static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] = diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index dcc0ede48..38f9be7c5 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -5,9 +5,9 @@ */ #include "CellImpl.h" +#include "GossipDef.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "GossipDef.h" #include "Map.h" #include "MapManager.h" #include "MapRefManager.h" diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index ce2418e5b..dd688117a 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -4,28 +4,28 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" +#include "Chat.h" #include "Config.h" +#include "CreatureAI.h" #include "DatabaseEnv.h" #include "DBCStores.h" +#include "GossipDef.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" +#include "Player.h" +#include "ScriptedGossip.h" #include "ScriptLoader.h" +#include "ScriptMgr.h" #include "ScriptSystem.h" -#include "Transport.h" -#include "Vehicle.h" #include "SpellInfo.h" #include "SpellScript.h" -#include "GossipDef.h" -#include "ScriptedGossip.h" -#include "CreatureAI.h" -#include "Player.h" +#include "Transport.h" +#include "Vehicle.h" #include "WorldPacket.h" -#include "Chat.h" #ifdef ELUNA -#include "LuaEngine.h" #include "ElunaUtility.h" +#include "LuaEngine.h" #endif // Specialize for each script type class like so: diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 6fd904c35..2ef884abd 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -7,20 +7,20 @@ #ifndef SC_SCRIPTMGR_H #define SC_SCRIPTMGR_H +#include "AchievementMgr.h" +#include "ArenaTeam.h" +#include "AuctionHouseMgr.h" #include "Battleground.h" #include "Common.h" -#include "ObjectMgr.h" #include "DBCStores.h" +#include "DynamicObject.h" +#include "GameEventMgr.h" +#include "ObjectMgr.h" +#include "PetDefines.h" #include "QuestDef.h" #include "SharedDefines.h" -#include "World.h" #include "Weather.h" -#include "AchievementMgr.h" -#include "DynamicObject.h" -#include "ArenaTeam.h" -#include "GameEventMgr.h" -#include "PetDefines.h" -#include "AuctionHouseMgr.h" +#include "World.h" #include class AuctionHouseObject; diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index 9f5b2c0da..12e570ed7 100644 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptSystem.h" -#include "ObjectMgr.h" #include "DatabaseEnv.h" +#include "ObjectMgr.h" #include "ScriptMgr.h" +#include "ScriptSystem.h" ScriptPointVector const SystemMgr::_empty; diff --git a/src/server/game/Server/Protocol/PacketLog.cpp b/src/server/game/Server/Protocol/PacketLog.cpp index ac3f21f01..ce9d9c075 100644 --- a/src/server/game/Server/Protocol/PacketLog.cpp +++ b/src/server/game/Server/Protocol/PacketLog.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "PacketLog.h" -#include "Config.h" #include "ByteBuffer.h" +#include "Config.h" +#include "PacketLog.h" #include "WorldPacket.h" PacketLog::PacketLog() : _file(nullptr) diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 372d01587..1abe7d91e 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -9,32 +9,33 @@ */ #include "WorldSocket.h" // must be first to make ACE happy with ACE includes in it +#include "AccountMgr.h" +#include "BattlegroundMgr.h" #include "Common.h" #include "DatabaseEnv.h" -#include "Log.h" -#include "Opcodes.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "Pet.h" -#include "Player.h" -#include "Vehicle.h" -#include "ObjectMgr.h" -#include "GuildMgr.h" #include "Group.h" #include "Guild.h" -#include "World.h" -#include "ObjectAccessor.h" -#include "BattlegroundMgr.h" -#include "OutdoorPvPMgr.h" +#include "GuildMgr.h" +#include "Log.h" #include "MapManager.h" -#include "SocialMgr.h" -#include "zlib.h" -#include "ScriptMgr.h" -#include "Transport.h" -#include "WardenWin.h" -#include "WardenMac.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "OutdoorPvPMgr.h" +#include "Pet.h" +#include "Player.h" #include "SavingSystem.h" -#include "AccountMgr.h" +#include "ScriptMgr.h" +#include "SocialMgr.h" +#include "Transport.h" +#include "Vehicle.h" +#include "WardenMac.h" +#include "WardenWin.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" +#include "zlib.h" + #ifdef ELUNA #include "LuaEngine.h" #endif diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 8823a0ebc..b4ca45b9f 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -11,19 +11,18 @@ #ifndef __WORLDSESSION_H #define __WORLDSESSION_H -#include - -#include "Common.h" -#include "SharedDefines.h" +#include "AccountMgr.h" #include "AddonMgr.h" +#include "BanManager.h" +#include "Common.h" +#include "Cryptography/BigNumber.h" #include "DatabaseEnv.h" +#include "GossipDef.h" +#include "Opcodes.h" +#include "SharedDefines.h" #include "World.h" #include "WorldPacket.h" -#include "GossipDef.h" -#include "Cryptography/BigNumber.h" -#include "AccountMgr.h" -#include "BanManager.h" -#include "Opcodes.h" +#include class Creature; class GameObject; diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 7557f7a97..334f34e0d 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -4,34 +4,33 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "WorldSocket.h" +#include "AccountMgr.h" +#include "BigNumber.h" +#include "ByteBuffer.h" #include "Common.h" +#include "DatabaseEnv.h" +#include "Log.h" +#include "Opcodes.h" +#include "PacketLog.h" #include "Player.h" +#include "ScriptMgr.h" +#include "SHA1.h" +#include "SharedDefines.h" #include "Util.h" #include "World.h" #include "WorldPacket.h" -#include "SharedDefines.h" -#include "ByteBuffer.h" -#include "Opcodes.h" -#include "DatabaseEnv.h" -#include "BigNumber.h" -#include "SHA1.h" #include "WorldSession.h" +#include "WorldSocket.h" #include "WorldSocketMgr.h" -#include "Log.h" -#include "PacketLog.h" -#include "ScriptMgr.h" -#include "AccountMgr.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #ifdef ELUNA diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index 564a0abc1..f406cac2a 100644 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -13,21 +13,20 @@ #ifndef _WORLDSOCKET_H #define _WORLDSOCKET_H -#include -#include +#include "AuthCrypt.h" +#include "Common.h" +#include "Duration.h" +#include #include +#include +#include #include #include -#include #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Common.h" -#include "AuthCrypt.h" -#include "Duration.h" - class ACE_Message_Block; class WorldPacket; class WorldSession; diff --git a/src/server/game/Server/WorldSocketAcceptor.h b/src/server/game/Server/WorldSocketAcceptor.h index 65a228676..307c5461e 100644 --- a/src/server/game/Server/WorldSocketAcceptor.h +++ b/src/server/game/Server/WorldSocketAcceptor.h @@ -13,12 +13,10 @@ #define __WORLDSOCKETACCEPTOR_H_ #include "Common.h" - +#include "WorldSocket.h" #include #include -#include "WorldSocket.h" - class WorldSocketAcceptor : public ACE_Acceptor { public: diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index c3185332d..0198c8d47 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -9,30 +9,27 @@ * \author Derex */ -#include "WorldSocketMgr.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "Log.h" #include "Common.h" #include "Config.h" #include "DatabaseEnv.h" +#include "Log.h" +#include "ScriptMgr.h" #include "WorldSocket.h" #include "WorldSocketAcceptor.h" -#include "ScriptMgr.h" +#include "WorldSocketMgr.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /** * This is a helper class to WorldSocketMgr, that manages diff --git a/src/server/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp index cc271fe22..8e60a019a 100644 --- a/src/server/game/Skills/SkillDiscovery.cpp +++ b/src/server/game/Skills/SkillDiscovery.cpp @@ -6,12 +6,12 @@ #include "DatabaseEnv.h" #include "Log.h" -#include "World.h" -#include "Util.h" -#include "SkillDiscovery.h" -#include "SpellMgr.h" #include "Player.h" +#include "SkillDiscovery.h" #include "SpellInfo.h" +#include "SpellMgr.h" +#include "Util.h" +#include "World.h" #include struct SkillDiscoveryEntry diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp index db8767028..078463361 100644 --- a/src/server/game/Skills/SkillExtraItems.cpp +++ b/src/server/game/Skills/SkillExtraItems.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "SkillExtraItems.h" #include "DatabaseEnv.h" #include "Log.h" -#include "Player.h" #include "ObjectMgr.h" +#include "Player.h" +#include "SkillExtraItems.h" #include // some type definitions diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 70c495e71..eb8339391 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -4,30 +4,31 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "WorldPacket.h" -#include "Opcodes.h" -#include "Log.h" -#include "ObjectMgr.h" -#include "SpellMgr.h" -#include "Player.h" -#include "Unit.h" -#include "ObjectAccessor.h" -#include "Util.h" -#include "Spell.h" -#include "SpellAuraEffects.h" +#include "BattlefieldMgr.h" #include "Battleground.h" -#include "OutdoorPvPMgr.h" +#include "CellImpl.h" +#include "Common.h" #include "Formulas.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "CellImpl.h" -#include "ScriptMgr.h" -#include "Vehicle.h" -#include "BattlefieldMgr.h" -#include "Pet.h" -#include "ReputationMgr.h" #include "InstanceScript.h" +#include "Log.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "OutdoorPvPMgr.h" +#include "Pet.h" +#include "Player.h" +#include "ReputationMgr.h" +#include "ScriptMgr.h" +#include "Spell.h" +#include "SpellAuraEffects.h" +#include "SpellMgr.h" +#include "Unit.h" +#include "Util.h" +#include "Vehicle.h" +#include "WorldPacket.h" + #ifdef ELUNA #include "LuaEngine.h" #endif diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h index 8e1307f89..ccea8d802 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.h +++ b/src/server/game/Spells/Auras/SpellAuraEffects.h @@ -12,8 +12,8 @@ class AuraEffect; class Aura; class SpellInfo; -#include "SpellAuras.h" #include "Spell.h" +#include "SpellAuras.h" typedef void(AuraEffect::*pAuraEffectHandler)(AuraApplication const* aurApp, uint8 mode, bool apply) const; diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 358774a30..84d300f20 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -4,26 +4,26 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "ArenaSpectator.h" +#include "CellImpl.h" #include "Common.h" -#include "WorldPacket.h" -#include "Opcodes.h" -#include "Log.h" -#include "ObjectMgr.h" -#include "SpellMgr.h" -#include "Player.h" -#include "Unit.h" -#include "Spell.h" -#include "SpellAuraEffects.h" #include "DynamicObject.h" -#include "ObjectAccessor.h" -#include "Util.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "CellImpl.h" +#include "Log.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Player.h" #include "ScriptMgr.h" +#include "Spell.h" +#include "SpellAuraEffects.h" +#include "SpellMgr.h" #include "SpellScript.h" +#include "Unit.h" +#include "Util.h" #include "Vehicle.h" -#include "ArenaSpectator.h" +#include "WorldPacket.h" // update aura target map every 500 ms instead of every update - reduce amount of grid searcher calls static constexpr int32 UPDATE_TARGET_MAP_INTERVAL = 500; diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index cfb100c19..85d51a362 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -9,49 +9,49 @@ #include "ElunaUtility.h" #endif +#include "ArenaSpectator.h" +#include "BattlefieldMgr.h" +#include "Battleground.h" +#include "BattlegroundIC.h" +#include "CellImpl.h" #include "Common.h" +#include "ConditionMgr.h" #include "DatabaseEnv.h" -#include "WorldPacket.h" -#include "WorldSession.h" +#include "DisableMgr.h" +#include "DynamicObject.h" +#include "GameObjectAI.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "Opcodes.h" -#include "Log.h" -#include "UpdateMask.h" -#include "World.h" -#include "ObjectMgr.h" -#include "SpellMgr.h" -#include "Player.h" -#include "Pet.h" -#include "Unit.h" -#include "Totem.h" -#include "Spell.h" -#include "DynamicObject.h" #include "Group.h" -#include "UpdateData.h" -#include "MapManager.h" -#include "ObjectAccessor.h" -#include "CellImpl.h" -#include "SharedDefines.h" +#include "InstanceScript.h" +#include "Log.h" #include "LootMgr.h" -#include "VMapFactory.h" +#include "MapManager.h" #include "MMapFactory.h" #include "MMapManager.h" -#include "Battleground.h" -#include "Util.h" -#include "TemporarySummon.h" -#include "Vehicle.h" -#include "SpellAuraEffects.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Pet.h" +#include "Player.h" #include "ScriptMgr.h" -#include "ConditionMgr.h" -#include "DisableMgr.h" -#include "SpellScript.h" -#include "InstanceScript.h" +#include "SharedDefines.h" +#include "Spell.h" +#include "SpellAuraEffects.h" #include "SpellInfo.h" -#include "BattlefieldMgr.h" -#include "BattlegroundIC.h" -#include "GameObjectAI.h" -#include "ArenaSpectator.h" +#include "SpellMgr.h" +#include "SpellScript.h" +#include "TemporarySummon.h" +#include "Totem.h" +#include "Unit.h" +#include "UpdateData.h" +#include "UpdateMask.h" +#include "Util.h" +#include "Vehicle.h" +#include "VMapFactory.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" extern pEffect SpellEffects[TOTAL_SPELL_EFFECTS]; diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index b7531f928..f7362a536 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -8,10 +8,10 @@ #define __SPELL_H #include "GridDefines.h" -#include "SharedDefines.h" #include "ObjectMgr.h" -#include "SpellInfo.h" #include "PathGenerator.h" +#include "SharedDefines.h" +#include "SpellInfo.h" class Unit; class Player; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 7449a4176..747a1e64e 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -4,59 +4,60 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "DatabaseEnv.h" -#include "WorldPacket.h" -#include "Opcodes.h" -#include "Log.h" -#include "UpdateMask.h" -#include "World.h" -#include "ObjectMgr.h" -#include "SpellMgr.h" -#include "Player.h" -#include "SkillExtraItems.h" -#include "Unit.h" -#include "Spell.h" -#include "DynamicObject.h" -#include "SpellAuras.h" -#include "SpellAuraEffects.h" -#include "Group.h" -#include "UpdateData.h" -#include "MapManager.h" -#include "ObjectAccessor.h" -#include "SharedDefines.h" -#include "Pet.h" -#include "GameObject.h" -#include "GossipDef.h" -#include "Creature.h" -#include "Totem.h" -#include "CreatureAI.h" -#include "BattlegroundMgr.h" +#include "AccountMgr.h" #include "Battleground.h" #include "BattlegroundEY.h" +#include "BattlegroundIC.h" +#include "BattlegroundMgr.h" +#include "BattlegroundSA.h" #include "BattlegroundWS.h" -#include "OutdoorPvPMgr.h" -#include "Language.h" -#include "SocialMgr.h" -#include "Util.h" -#include "VMapFactory.h" -#include "MMapFactory.h" -#include "MMapManager.h" -#include "TemporarySummon.h" #include "CellImpl.h" +#include "Common.h" +#include "Creature.h" +#include "CreatureAI.h" +#include "DatabaseEnv.h" +#include "DynamicObject.h" +#include "Formulas.h" +#include "GameObject.h" +#include "GameObjectAI.h" +#include "GossipDef.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "SkillDiscovery.h" -#include "Formulas.h" -#include "Vehicle.h" -#include "ScriptMgr.h" -#include "GameObjectAI.h" -#include "BattlegroundSA.h" -#include "BattlegroundIC.h" -#include "AccountMgr.h" +#include "Group.h" #include "InstanceScript.h" +#include "Language.h" +#include "Log.h" +#include "MapManager.h" +#include "MMapFactory.h" +#include "MMapManager.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "OutdoorPvPMgr.h" +#include "Pet.h" +#include "Player.h" #include "ReputationMgr.h" +#include "ScriptMgr.h" +#include "SharedDefines.h" +#include "SkillDiscovery.h" +#include "SkillExtraItems.h" +#include "SocialMgr.h" +#include "Spell.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellMgr.h" +#include "TemporarySummon.h" +#include "Totem.h" #include "Transport.h" +#include "Unit.h" +#include "UpdateData.h" +#include "UpdateMask.h" +#include "Util.h" +#include "Vehicle.h" +#include "VMapFactory.h" +#include "World.h" +#include "WorldPacket.h" + #ifdef ELUNA #include "LuaEngine.h" #endif diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 42f4532af..877fc49ea 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -4,16 +4,16 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "SpellAuraDefines.h" -#include "SpellInfo.h" -#include "SpellMgr.h" -#include "Spell.h" -#include "DBCStores.h" -#include "ConditionMgr.h" -#include "SpellAuraEffects.h" -#include "Player.h" #include "Battleground.h" #include "Chat.h" +#include "ConditionMgr.h" +#include "DBCStores.h" +#include "Player.h" +#include "Spell.h" +#include "SpellAuraDefines.h" +#include "SpellAuraEffects.h" +#include "SpellInfo.h" +#include "SpellMgr.h" uint32 GetTargetFlagMask(SpellTargetObjectTypes objType) { diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index 2cd3f6b73..cf520498d 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -7,10 +7,11 @@ #ifndef _SPELLINFO_H #define _SPELLINFO_H -#include "SharedDefines.h" -#include "Util.h" #include "DBCStructure.h" #include "Object.h" +#include "SharedDefines.h" +#include "SpellAuraDefines.h" +#include "Util.h" class Unit; class Player; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 3a0b77292..596b85c2f 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -4,25 +4,25 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "SpellMgr.h" -#include "SpellInfo.h" -#include "ObjectMgr.h" -#include "SpellAuras.h" -#include "SpellAuraDefines.h" -#include "SharedDefines.h" -#include "DBCStores.h" -#include "World.h" -#include "Chat.h" -#include "Spell.h" -#include "BattlegroundMgr.h" -#include "CreatureAI.h" -#include "MapManager.h" -#include "BattlegroundIC.h" -#include "BattlefieldWG.h" #include "BattlefieldMgr.h" -#include "InstanceScript.h" -#include "Player.h" +#include "BattlefieldWG.h" +#include "BattlegroundIC.h" +#include "BattlegroundMgr.h" +#include "Chat.h" +#include "CreatureAI.h" +#include "DBCStores.h" #include "GameGraveyard.h" +#include "InstanceScript.h" +#include "MapManager.h" +#include "ObjectMgr.h" +#include "Player.h" +#include "SharedDefines.h" +#include "Spell.h" +#include "SpellAuraDefines.h" +#include "SpellAuras.h" +#include "SpellInfo.h" +#include "SpellMgr.h" +#include "World.h" bool IsPrimaryProfessionSkill(uint32 skill) { diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index da97a9137..8e4e12bf8 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include #include "Spell.h" #include "SpellAuras.h" -#include "SpellScript.h" #include "SpellMgr.h" +#include "SpellScript.h" +#include bool _SpellScript::_Validate(SpellInfo const* entry) { diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index b856578ea..487cd3e23 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -7,10 +7,10 @@ #ifndef __SPELL_SCRIPT_H #define __SPELL_SCRIPT_H -#include "Util.h" #include "SharedDefines.h" -#include "SpellAuraDefines.h" #include "Spell.h" +#include "SpellAuraDefines.h" +#include "Util.h" #include class Unit; diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index ec7fde75b..d5d6e3415 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -4,15 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "DatabaseEnv.h" -#include "ObjectMgr.h" #include "Cell.h" #include "CellImpl.h" #include "Chat.h" +#include "Common.h" +#include "CreatureTextMgr.h" +#include "DatabaseEnv.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "CreatureTextMgr.h" +#include "ObjectMgr.h" class CreatureTextBuilder { diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index e9d44db89..7a8f1dc22 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -10,8 +10,8 @@ #include "Creature.h" #include "GridNotifiers.h" #include "ObjectAccessor.h" -#include "SharedDefines.h" #include "Opcodes.h" +#include "SharedDefines.h" enum CreatureTextRange { diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp index 16603d2c8..c23569d36 100644 --- a/src/server/game/Tickets/TicketMgr.cpp +++ b/src/server/game/Tickets/TicketMgr.cpp @@ -4,17 +4,17 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "Chat.h" #include "Common.h" -#include "TicketMgr.h" #include "DatabaseEnv.h" #include "Language.h" #include "Log.h" +#include "Opcodes.h" +#include "Player.h" +#include "TicketMgr.h" +#include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Chat.h" -#include "World.h" -#include "Player.h" -#include "Opcodes.h" inline float GetAge(uint64 t) { return float(time(nullptr) - t) / DAY; } diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index 831dd892f..21c97f47e 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" #include "CharacterDatabaseCleaner.h" -#include "World.h" +#include "Common.h" #include "Database/DatabaseEnv.h" -#include "SpellMgr.h" #include "DBCStores.h" +#include "SpellMgr.h" +#include "World.h" void CharacterDatabaseCleaner::CleanDatabase() { diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.h b/src/server/game/Tools/CharacterDatabaseCleaner.h index f960674c0..615df448f 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.h +++ b/src/server/game/Tools/CharacterDatabaseCleaner.h @@ -4,6 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "Define.h" + #ifndef CHARACTERDATABASECLEANER_H #define CHARACTERDATABASECLEANER_H diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index 5cf2500e8..d5006db9c 100644 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "PlayerDump.h" -#include "DatabaseEnv.h" -#include "UpdateFields.h" -#include "ObjectMgr.h" #include "AccountMgr.h" +#include "Common.h" +#include "DatabaseEnv.h" +#include "ObjectMgr.h" +#include "PlayerDump.h" +#include "UpdateFields.h" #include "World.h" #define DUMP_TABLE_COUNT 27 diff --git a/src/server/game/Tools/PlayerDump.h b/src/server/game/Tools/PlayerDump.h index 7c9989be1..37492c3f0 100644 --- a/src/server/game/Tools/PlayerDump.h +++ b/src/server/game/Tools/PlayerDump.h @@ -7,9 +7,9 @@ #ifndef _PLAYER_DUMP_H #define _PLAYER_DUMP_H -#include #include #include +#include enum DumpTableType { diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp index 727c0582d..31309078b 100644 --- a/src/server/game/Warden/Warden.cpp +++ b/src/server/game/Warden/Warden.cpp @@ -4,21 +4,21 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" -#include "WorldPacket.h" -#include "WorldSession.h" -#include "Log.h" -#include "Opcodes.h" -#include "ByteBuffer.h" -#include -#include -#include "World.h" -#include "Player.h" -#include "Util.h" -#include "Warden.h" #include "AccountMgr.h" #include "BanManager.h" +#include "ByteBuffer.h" +#include "Common.h" +#include "Log.h" +#include "Opcodes.h" +#include "Player.h" #include "SharedDefines.h" +#include "Util.h" +#include "Warden.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" +#include +#include Warden::Warden() : _session(nullptr), _inputCrypto(16), _outputCrypto(16), _checkTimer(10000/*10 sec*/), _clientResponseTimer(0), _dataSent(false), _module(nullptr), _initialized(false) diff --git a/src/server/game/Warden/Warden.h b/src/server/game/Warden/Warden.h index 691d9232e..8e071e50c 100644 --- a/src/server/game/Warden/Warden.h +++ b/src/server/game/Warden/Warden.h @@ -7,11 +7,11 @@ #ifndef _WARDEN_BASE_H #define _WARDEN_BASE_H -#include +#include "ByteBuffer.h" #include "Cryptography/ARC4.h" #include "Cryptography/BigNumber.h" -#include "ByteBuffer.h" #include "WardenCheckMgr.h" +#include enum WardenOpcodes { diff --git a/src/server/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp index a38e665e7..df3d37e83 100644 --- a/src/server/game/Warden/WardenCheckMgr.cpp +++ b/src/server/game/Warden/WardenCheckMgr.cpp @@ -5,13 +5,13 @@ */ #include "Common.h" +#include "Database/DatabaseEnv.h" +#include "Log.h" +#include "Util.h" +#include "Warden.h" +#include "WardenCheckMgr.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Log.h" -#include "Database/DatabaseEnv.h" -#include "Util.h" -#include "WardenCheckMgr.h" -#include "Warden.h" WardenCheckMgr::WardenCheckMgr() { diff --git a/src/server/game/Warden/WardenCheckMgr.h b/src/server/game/Warden/WardenCheckMgr.h index a1af675fe..518b9de8a 100644 --- a/src/server/game/Warden/WardenCheckMgr.h +++ b/src/server/game/Warden/WardenCheckMgr.h @@ -7,8 +7,8 @@ #ifndef _WARDENCHECKMGR_H #define _WARDENCHECKMGR_H -#include #include "Cryptography/BigNumber.h" +#include enum WardenActions { diff --git a/src/server/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp index d1fb4fb13..2d53a09b0 100644 --- a/src/server/game/Warden/WardenMac.cpp +++ b/src/server/game/Warden/WardenMac.cpp @@ -4,19 +4,19 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Cryptography/WardenKeyGeneration.h" +#include "ByteBuffer.h" #include "Common.h" -#include "WorldPacket.h" -#include "WorldSession.h" +#include "WardenKeyGeneration.h" #include "Log.h" #include "Opcodes.h" -#include "ByteBuffer.h" -#include -#include "World.h" #include "Player.h" #include "Util.h" #include "WardenMac.h" #include "WardenModuleMac.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" +#include WardenMac::WardenMac() : Warden() { diff --git a/src/server/game/Warden/WardenMac.h b/src/server/game/Warden/WardenMac.h index 99415b9cc..0c03992a5 100644 --- a/src/server/game/Warden/WardenMac.h +++ b/src/server/game/Warden/WardenMac.h @@ -7,11 +7,11 @@ #ifndef _WARDEN_MAC_H #define _WARDEN_MAC_H -#include "Cryptography/ARC4.h" -#include -#include "Cryptography/BigNumber.h" #include "ByteBuffer.h" +#include "ARC4.h" +#include "BigNumber.h" #include "Warden.h" +#include class WorldSession; class Warden; diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp index 5a9a2843b..b33b1ff4d 100644 --- a/src/server/game/Warden/WardenWin.cpp +++ b/src/server/game/Warden/WardenWin.cpp @@ -4,23 +4,23 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "AccountMgr.h" +#include "ByteBuffer.h" +#include "Common.h" #include "Cryptography/HMACSHA1.h" #include "Cryptography/WardenKeyGeneration.h" -#include "Common.h" -#include "WorldPacket.h" -#include "WorldSession.h" +#include "Database/DatabaseEnv.h" #include "Log.h" #include "Opcodes.h" -#include "ByteBuffer.h" -#include -#include "Database/DatabaseEnv.h" -#include "World.h" #include "Player.h" #include "Util.h" -#include "WardenWin.h" -#include "WardenModuleWin.h" #include "WardenCheckMgr.h" -#include "AccountMgr.h" +#include "WardenModuleWin.h" +#include "WardenWin.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" +#include // GUILD is the shortest string that has no client validation (RAID only sends if in a raid group) static constexpr char _luaEvalPrefix[] = "local S,T,R=SendAddonMessage,function()"; diff --git a/src/server/game/Warden/WardenWin.h b/src/server/game/Warden/WardenWin.h index 1546018bd..e9559f995 100644 --- a/src/server/game/Warden/WardenWin.h +++ b/src/server/game/Warden/WardenWin.h @@ -7,11 +7,11 @@ #ifndef _WARDEN_WIN_H #define _WARDEN_WIN_H -#include +#include "ByteBuffer.h" #include "Cryptography/ARC4.h" #include "Cryptography/BigNumber.h" -#include "ByteBuffer.h" #include "Warden.h" +#include #if defined(__GNUC__) #pragma pack(1) diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp index 4f1e325cd..ee53a65b1 100644 --- a/src/server/game/Weather/Weather.cpp +++ b/src/server/game/Weather/Weather.cpp @@ -8,14 +8,14 @@ \ingroup world */ -#include "Weather.h" -#include "WorldPacket.h" -#include "Player.h" -#include "World.h" #include "Log.h" #include "ObjectMgr.h" -#include "Util.h" +#include "Player.h" #include "ScriptMgr.h" +#include "Util.h" +#include "Weather.h" +#include "World.h" +#include "WorldPacket.h" #include "WorldSession.h" /// Create the Weather object diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp index cf5bdf5ef..e2b94d807 100644 --- a/src/server/game/Weather/WeatherMgr.cpp +++ b/src/server/game/Weather/WeatherMgr.cpp @@ -8,11 +8,11 @@ \ingroup world */ -#include "WeatherMgr.h" -#include "Weather.h" #include "Log.h" #include "ObjectMgr.h" #include "Player.h" +#include "Weather.h" +#include "WeatherMgr.h" #include "WorldPacket.h" #include "WorldSession.h" #include diff --git a/src/server/game/World/IWorld.h b/src/server/game/World/IWorld.h index 51acacccd..bf0aa6bf9 100644 --- a/src/server/game/World/IWorld.h +++ b/src/server/game/World/IWorld.h @@ -5,16 +5,15 @@ #ifndef AZEROTHCORE_IWORLD_H #define AZEROTHCORE_IWORLD_H -#include "Common.h" -#include "Timer.h" -#include "SharedDefines.h" -#include "QueryResult.h" #include "Callback.h" - +#include "Common.h" +#include "QueryResult.h" +#include "SharedDefines.h" +#include "Timer.h" +#include +#include #include #include -#include -#include class WorldSession; class Player; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 7cc1c0ec6..aace850eb 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -8,75 +8,75 @@ \ingroup world */ -#include "Common.h" -#include "DatabaseEnv.h" -#include "Config.h" -#include "GitRevision.h" -#include "Log.h" -#include "Opcodes.h" -#include "WorldSession.h" -#include "WorldPacket.h" -#include "Player.h" -#include "Vehicle.h" -#include "SkillExtraItems.h" -#include "SkillDiscovery.h" -#include "World.h" #include "AccountMgr.h" #include "AchievementMgr.h" -#include "AuctionHouseMgr.h" -#include "ObjectMgr.h" -#include "ArenaTeamMgr.h" -#include "GuildMgr.h" -#include "TicketMgr.h" -#include "SpellMgr.h" -#include "GroupMgr.h" -#include "Chat.h" -#include "DBCStores.h" -#include "LootMgr.h" -#include "ItemEnchantmentMgr.h" -#include "MapManager.h" -#include "CreatureAIRegistry.h" -#include "BattlegroundMgr.h" -#include "BattlefieldMgr.h" -#include "OutdoorPvPMgr.h" -#include "TemporarySummon.h" -#include "WaypointMovementGenerator.h" -#include "VMapFactory.h" -#include "MMapFactory.h" -#include "GameEventMgr.h" -#include "PoolMgr.h" -#include "GridNotifiersImpl.h" -#include "CellImpl.h" -#include "InstanceSaveMgr.h" -#include "Util.h" -#include "Language.h" -#include "CreatureGroups.h" -#include "Transport.h" -#include "ScriptMgr.h" #include "AddonMgr.h" -#include "LFGMgr.h" -#include "ConditionMgr.h" -#include "DisableMgr.h" -#include "CharacterDatabaseCleaner.h" -#include "ScriptMgr.h" -#include "WeatherMgr.h" -#include "CreatureTextMgr.h" -#include "SmartAI.h" +#include "ArenaTeamMgr.h" +#include "AsyncAuctionListing.h" +#include "AuctionHouseMgr.h" +#include "AvgDiffTracker.h" +#include "BattlefieldMgr.h" +#include "BattlegroundMgr.h" +#include "CalendarMgr.h" +#include "CellImpl.h" #include "Channel.h" #include "ChannelMgr.h" -#include "WardenCheckMgr.h" -#include "Warden.h" -#include "CalendarMgr.h" -#include "PetitionMgr.h" -#include "LootItemStorage.h" -#include "TransportMgr.h" -#include "AvgDiffTracker.h" +#include "CharacterDatabaseCleaner.h" +#include "Chat.h" +#include "Common.h" +#include "ConditionMgr.h" +#include "Config.h" +#include "CreatureAIRegistry.h" +#include "CreatureGroups.h" +#include "CreatureTextMgr.h" +#include "DatabaseEnv.h" +#include "DBCStores.h" +#include "DisableMgr.h" #include "DynamicVisibility.h" -#include "WhoListCache.h" -#include "AsyncAuctionListing.h" -#include "SavingSystem.h" -#include "ServerMotd.h" +#include "GameEventMgr.h" #include "GameGraveyard.h" +#include "GitRevision.h" +#include "GridNotifiersImpl.h" +#include "GroupMgr.h" +#include "GuildMgr.h" +#include "InstanceSaveMgr.h" +#include "ItemEnchantmentMgr.h" +#include "Language.h" +#include "LFGMgr.h" +#include "Log.h" +#include "LootItemStorage.h" +#include "LootMgr.h" +#include "MapManager.h" +#include "MMapFactory.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "OutdoorPvPMgr.h" +#include "PetitionMgr.h" +#include "Player.h" +#include "PoolMgr.h" +#include "SavingSystem.h" +#include "ScriptMgr.h" +#include "ScriptMgr.h" +#include "ServerMotd.h" +#include "SkillDiscovery.h" +#include "SkillExtraItems.h" +#include "SmartAI.h" +#include "SpellMgr.h" +#include "TemporarySummon.h" +#include "TicketMgr.h" +#include "Transport.h" +#include "TransportMgr.h" +#include "Util.h" +#include "Vehicle.h" +#include "VMapFactory.h" +#include "Warden.h" +#include "WardenCheckMgr.h" +#include "WaypointMovementGenerator.h" +#include "WeatherMgr.h" +#include "WhoListCache.h" +#include "World.h" +#include "WorldPacket.h" +#include "WorldSession.h" #include #ifdef ELUNA diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 26fdf9770..389979990 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -11,17 +11,16 @@ #ifndef __WORLD_H #define __WORLD_H -#include "IWorld.h" -#include "Common.h" -#include "Timer.h" -#include "SharedDefines.h" -#include "QueryResult.h" #include "Callback.h" - +#include "Common.h" +#include "IWorld.h" +#include "QueryResult.h" +#include "SharedDefines.h" +#include "Timer.h" +#include +#include #include #include -#include -#include class Object; class WorldPacket; diff --git a/src/server/scripts/Commands/PlayerCommand.cpp b/src/server/scripts/Commands/PlayerCommand.cpp index 18769550f..5e0f4ec16 100644 --- a/src/server/scripts/Commands/PlayerCommand.cpp +++ b/src/server/scripts/Commands/PlayerCommand.cpp @@ -3,10 +3,10 @@ */ #include "Chat.h" -#include "ScriptMgr.h" #include "Language.h" #include "Player.h" #include "PlayerCommand.h" +#include "ScriptMgr.h" bool PlayerCommand::Learn(ChatHandler* handler, Player* targetPlayer, uint32 spell, char const* all) { diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 3d4dc5c4a..8871d9846 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -11,11 +11,11 @@ Comment: All account related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "AccountMgr.h" #include "Chat.h" #include "Language.h" #include "Player.h" +#include "ScriptMgr.h" class account_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_arena.cpp b/src/server/scripts/Commands/cs_arena.cpp index bce5519c9..1dd0886ee 100644 --- a/src/server/scripts/Commands/cs_arena.cpp +++ b/src/server/scripts/Commands/cs_arena.cpp @@ -11,12 +11,12 @@ Comment: All arena team related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "ArenaTeamMgr.h" #include "Chat.h" #include "Language.h" #include "ObjectMgr.h" #include "Player.h" +#include "ScriptMgr.h" class arena_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index a1dc081d0..f84e13468 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -12,13 +12,13 @@ Category: commandscripts EndScriptData */ #include "AccountMgr.h" +#include "BanManager.h" #include "Chat.h" #include "Language.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" #include "ScriptMgr.h" -#include "BanManager.h" /// Ban function modes enum BanMode diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp index 952bf034e..6891cfc17 100644 --- a/src/server/scripts/Commands/cs_bf.cpp +++ b/src/server/scripts/Commands/cs_bf.cpp @@ -11,9 +11,9 @@ Comment: All bf related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" -#include "Chat.h" #include "BattlefieldMgr.h" +#include "Chat.h" +#include "ScriptMgr.h" class bf_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp index eddb9866c..77a1a194d 100644 --- a/src/server/scripts/Commands/cs_cast.cpp +++ b/src/server/scripts/Commands/cs_cast.cpp @@ -11,11 +11,11 @@ Comment: All cast related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Chat.h" #include "Creature.h" #include "Language.h" #include "Player.h" +#include "ScriptMgr.h" #include "SpellInfo.h" class cast_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index ca7de4803..d11c936a1 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -13,12 +13,12 @@ EndScriptData */ #include "AccountMgr.h" #include "Chat.h" +#include "Implementation/CharacterDatabase.h" #include "ObjectMgr.h" -#include "PlayerDump.h" #include "Player.h" +#include "PlayerDump.h" #include "ReputationMgr.h" #include "ScriptMgr.h" -#include "Implementation/CharacterDatabase.h" class character_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 51f2a4285..091876e13 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -11,17 +11,16 @@ Comment: All debug related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" -#include "ObjectMgr.h" #include "BattlegroundMgr.h" -#include "Chat.h" #include "Cell.h" #include "CellImpl.h" +#include "Chat.h" +#include "GossipDef.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "GossipDef.h" #include "Language.h" - +#include "ObjectMgr.h" +#include "ScriptMgr.h" #include class debug_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_deserter.cpp b/src/server/scripts/Commands/cs_deserter.cpp index 13b4d0d92..5ef1e2028 100644 --- a/src/server/scripts/Commands/cs_deserter.cpp +++ b/src/server/scripts/Commands/cs_deserter.cpp @@ -5,11 +5,11 @@ */ #include "Chat.h" -#include "Player.h" #include "Language.h" +#include "Player.h" #include "ScriptMgr.h" -#include "SpellAuras.h" #include "SpellAuraEffects.h" +#include "SpellAuras.h" enum Spells { diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp index 78c867161..6d5d970df 100644 --- a/src/server/scripts/Commands/cs_disable.cpp +++ b/src/server/scripts/Commands/cs_disable.cpp @@ -11,9 +11,9 @@ Comment: All disable related commands Category: commandscripts EndScriptData */ -#include "DisableMgr.h" #include "AchievementMgr.h" #include "Chat.h" +#include "DisableMgr.h" #include "Language.h" #include "ObjectMgr.h" #include "OutdoorPvP.h" diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index 500e7dad6..e2dcb823d 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -11,14 +11,14 @@ Comment: All gm related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" -#include "ObjectMgr.h" -#include "Chat.h" #include "AccountMgr.h" +#include "Chat.h" #include "Language.h" -#include "World.h" -#include "Player.h" +#include "ObjectMgr.h" #include "Opcodes.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "World.h" class gm_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index e35355811..e3c6ea676 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -11,14 +11,14 @@ Comment: All go related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" -#include "ObjectMgr.h" -#include "MapManager.h" -#include "TicketMgr.h" #include "Chat.h" -#include "Language.h" -#include "Player.h" #include "GameGraveyard.h" +#include "Language.h" +#include "MapManager.h" +#include "ObjectMgr.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "TicketMgr.h" class go_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 4a5ad5975..5da04f949 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -11,17 +11,17 @@ Comment: All gobject related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" -#include "GameEventMgr.h" -#include "ObjectMgr.h" -#include "PoolMgr.h" -#include "MapManager.h" #include "Chat.h" -#include "Language.h" -#include "Player.h" -#include "Opcodes.h" -#include "Transport.h" +#include "GameEventMgr.h" #include "GameObject.h" +#include "Language.h" +#include "MapManager.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Player.h" +#include "PoolMgr.h" +#include "ScriptMgr.h" +#include "Transport.h" class gobject_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp index 1692cf1ac..345c7d058 100644 --- a/src/server/scripts/Commands/cs_guild.cpp +++ b/src/server/scripts/Commands/cs_guild.cpp @@ -12,9 +12,9 @@ Category: commandscripts EndScriptData */ #include "Chat.h" -#include "Language.h" #include "Guild.h" #include "GuildMgr.h" +#include "Language.h" #include "ObjectAccessor.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index 12328d5be..a52072de9 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -11,14 +11,14 @@ Comment: All instance related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Chat.h" #include "Group.h" #include "InstanceSaveMgr.h" #include "InstanceScript.h" +#include "Language.h" #include "MapManager.h" #include "Player.h" -#include "Language.h" +#include "ScriptMgr.h" class instance_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index ceba65417..59db1843e 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -12,14 +12,14 @@ Category: commandscripts EndScriptData */ #include "Chat.h" -#include "ScriptMgr.h" -#include "ObjectMgr.h" #include "Language.h" -#include "SpellMgr.h" -#include "SpellInfo.h" -#include "Player.h" +#include "ObjectMgr.h" #include "Pet.h" +#include "Player.h" #include "PlayerCommand.h" +#include "ScriptMgr.h" +#include "SpellInfo.h" +#include "SpellMgr.h" class learn_commandscript : public CommandScript, public PlayerCommand { diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp index ff996259e..22b6c8573 100644 --- a/src/server/scripts/Commands/cs_lfg.cpp +++ b/src/server/scripts/Commands/cs_lfg.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "Chat.h" +#include "Group.h" #include "Language.h" #include "LFGMgr.h" -#include "Group.h" #include "Player.h" +#include "ScriptMgr.h" void GetPlayerInfo(ChatHandler* handler, Player* player) { diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index 917bfee77..6d529ec60 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -11,13 +11,13 @@ Comment: All list related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Chat.h" -#include "SpellAuraEffects.h" #include "Language.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" class list_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp index eaab0676e..071448bc5 100644 --- a/src/server/scripts/Commands/cs_message.cpp +++ b/src/server/scripts/Commands/cs_message.cpp @@ -11,11 +11,11 @@ Comment: All message related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" -#include "Chat.h" #include "ChannelMgr.h" +#include "Chat.h" #include "Language.h" #include "Player.h" +#include "ScriptMgr.h" class message_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 44599347b..8e3a9065b 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -4,30 +4,30 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Chat.h" -#include "ScriptMgr.h" #include "AccountMgr.h" +#include "ace/INET_Addr.h" #include "ArenaTeamMgr.h" +#include "BattlegroundMgr.h" #include "CellImpl.h" +#include "Chat.h" +#include "GameGraveyard.h" #include "GridNotifiers.h" #include "Group.h" +#include "GroupMgr.h" #include "GuildMgr.h" #include "InstanceSaveMgr.h" #include "Language.h" +#include "LFG.h" +#include "MapManager.h" #include "MovementGenerator.h" #include "ObjectAccessor.h" #include "Opcodes.h" +#include "Pet.h" +#include "Player.h" +#include "ScriptMgr.h" #include "SpellAuras.h" #include "TargetedMovementGenerator.h" #include "WeatherMgr.h" -#include "ace/INET_Addr.h" -#include "Player.h" -#include "Pet.h" -#include "LFG.h" -#include "GroupMgr.h" -#include "BattlegroundMgr.h" -#include "MapManager.h" -#include "GameGraveyard.h" class misc_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index 484421006..cfd73082a 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -23,19 +23,19 @@ * mmap sub-commands */ -#include "ScriptMgr.h" +#include "CellImpl.h" #include "Chat.h" #include "DisableMgr.h" -#include "ObjectMgr.h" -#include "Player.h" -#include "PointMovementGenerator.h" -#include "PathGenerator.h" -#include "MMapFactory.h" -#include "Map.h" -#include "TargetedMovementGenerator.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "CellImpl.h" +#include "Map.h" +#include "MMapFactory.h" +#include "ObjectMgr.h" +#include "PathGenerator.h" +#include "Player.h" +#include "PointMovementGenerator.h" +#include "ScriptMgr.h" +#include "TargetedMovementGenerator.h" class mmaps_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 1248c91b5..0cc1d159e 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -11,6 +11,7 @@ Comment: All modify related commands Category: commandscripts EndScriptData */ +#include "AccountMgr.h" #include "Chat.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -18,7 +19,6 @@ EndScriptData */ #include "Player.h" #include "ReputationMgr.h" #include "ScriptMgr.h" -#include "AccountMgr.h" class modify_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 6a76cc507..892e36004 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -11,16 +11,16 @@ Comment: All npc related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" -#include "ObjectMgr.h" #include "Chat.h" -#include "Transport.h" +#include "CreatureAI.h" #include "CreatureGroups.h" #include "Language.h" -#include "TargetedMovementGenerator.h" // for HandleNpcUnFollowCommand -#include "CreatureAI.h" -#include "Player.h" +#include "ObjectMgr.h" #include "Pet.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "TargetedMovementGenerator.h" // for HandleNpcUnFollowCommand +#include "Transport.h" struct NpcFlagText { diff --git a/src/server/scripts/Commands/cs_player.cpp b/src/server/scripts/Commands/cs_player.cpp index 9e455e159..a88e7972e 100644 --- a/src/server/scripts/Commands/cs_player.cpp +++ b/src/server/scripts/Commands/cs_player.cpp @@ -3,10 +3,10 @@ */ #include "Chat.h" -#include "ScriptMgr.h" #include "Language.h" #include "Player.h" #include "PlayerCommand.h" +#include "ScriptMgr.h" class player_commandscript : public CommandScript, public PlayerCommand { diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 1185a7265..b1166455d 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -17,6 +17,7 @@ EndScriptData */ #include "Chat.h" #include "CreatureTextMgr.h" #include "DisableMgr.h" +#include "GameGraveyard.h" #include "Language.h" #include "LFGMgr.h" #include "MapManager.h" @@ -29,7 +30,6 @@ EndScriptData */ #include "TicketMgr.h" #include "WardenCheckMgr.h" #include "WaypointManager.h" -#include "GameGraveyard.h" class reload_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index d6b4bba7a..68563ec35 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -15,8 +15,8 @@ EndScriptData */ #include "Chat.h" #include "Language.h" #include "ObjectAccessor.h" -#include "Player.h" #include "Pet.h" +#include "Player.h" #include "ScriptMgr.h" class reset_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index fd2a5d706..c9063112d 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -11,14 +11,14 @@ Comment: All server related commands Category: commandscripts EndScriptData */ +#include "AvgDiffTracker.h" #include "Chat.h" #include "Config.h" +#include "GitRevision.h" #include "Language.h" #include "ObjectAccessor.h" #include "Player.h" #include "ScriptMgr.h" -#include "GitRevision.h" -#include "AvgDiffTracker.h" #include "ServerMotd.h" class server_commandscript : public CommandScript diff --git a/src/server/scripts/Commands/cs_spectator.cpp b/src/server/scripts/Commands/cs_spectator.cpp index 626c9fcdc..8042b6f2e 100644 --- a/src/server/scripts/Commands/cs_spectator.cpp +++ b/src/server/scripts/Commands/cs_spectator.cpp @@ -1,14 +1,14 @@ -#include "ScriptMgr.h" -#include "ObjectMgr.h" -#include "Chat.h" #include "AccountMgr.h" -#include "World.h" -#include "Player.h" -#include "Opcodes.h" #include "ArenaSpectator.h" -#include "LFGMgr.h" #include "BattlegroundMgr.h" +#include "Chat.h" +#include "LFGMgr.h" +#include "ObjectMgr.h" +#include "Opcodes.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "World.h" class spectator_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp index 6e5c0e555..b2af4cda0 100644 --- a/src/server/scripts/Commands/cs_ticket.cpp +++ b/src/server/scripts/Commands/cs_ticket.cpp @@ -17,8 +17,8 @@ EndScriptData */ #include "ObjectMgr.h" #include "Opcodes.h" #include "Player.h" -#include "TicketMgr.h" #include "ScriptMgr.h" +#include "TicketMgr.h" class ticket_commandscript : public CommandScript { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index 4ad9a0a44..7f4a8486f 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index f91b90368..23e35825b 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index 1107499ef..5746cb61e 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index d09365c23..d206e7b65 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index 2da56dfcf..fcbe63ab2 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp index f3187e058..091e100ab 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" +#include "blackrock_depths.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "blackrock_depths.h" -#include "Player.h" +#include "ScriptMgr.h" #include "WorldSession.h" uint32 braziersUsed = 0; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp index 21db9fc60..e11b8c305 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_depths.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp index 773dd7750..47ae12aaa 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index 61b854f5a..b57c37ffc 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_depths.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp index 18286215f..ba5dc3714 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp index 70aee7ea1..ec9fda145 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp index 88f1b020e..5ae7b1231 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Grizzle { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index e53c8854b..cbf55f53f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp index 8c1ae8a4c..b953b7701 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp index 6c704d10c..059d1018b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp index 4c01bed67..b665ae0ba 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "blackrock_depths.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp index f498946a7..6bdaea7eb 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "InstanceScript.h" #include "blackrock_depths.h" +#include "InstanceScript.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #define TIMER_TOMBOFTHESEVEN 15000 #define MAX_ENCOUNTER 6 diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h index b4198a05f..e3a28f4e5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h @@ -4,6 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "CreatureAIImpl.h" + #ifndef DEF_BLACKROCK_SPIRE_H #define DEF_BLACKROCK_SPIRE_H diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp index e6e6a5ec8..7c630ce99 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_spire.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp index 66ff9982f..6b7d3ce89 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_spire.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "TemporarySummon.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp index 57e532ee6..58c2c17ed 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_spire.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp index a2d317f4e..82a367451 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_spire.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp index 72921dcf5..f57ef54b1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_spire.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp index ffabe72f6..0fdeeb91d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_spire.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp index 2672c682d..90f6e794c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_spire.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp index bb0c295b9..76c85fef3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "Player.h" -#include "Spell.h" #include "blackrock_spire.h" +#include "ObjectMgr.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Spell.h" enum Text { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp index 9fc7eb20d..07331c588 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_spire.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp index addbec6a6..bda225d83 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "Player.h" #include "blackrock_spire.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index 8a1eddcec..250e18332 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_spire.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp index a69d0aae4..501cab3ba 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_spire.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp index b86577bd8..2d9fa3cd6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_spire.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp index b2d2704f6..e8fb7cf7b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackrock_spire.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp index ab458b7ef..8c4b1417e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -4,16 +4,16 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ObjectDefines.h" +#include "blackrock_spire.h" #include "Cell.h" #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "InstanceScript.h" +#include "ObjectDefines.h" +#include "ObjectMgr.h" #include "ScriptedCreature.h" -#include "blackrock_spire.h" +#include "ScriptMgr.h" //uint32 const DragonspireRunes[7] = { GO_HALL_RUNE_1, GO_HALL_RUNE_2, GO_HALL_RUNE_3, GO_HALL_RUNE_4, GO_HALL_RUNE_5, GO_HALL_RUNE_6, GO_HALL_RUNE_7 }; 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 b63b2c4ab..db5a75c10 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackwing_lair.h" #include "GameObject.h" #include "GameObjectAI.h" #include "InstanceScript.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Say { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp index 5078a3b2b..66b113702 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp @@ -4,14 +4,14 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "blackwing_lair.h" -#include "InstanceScript.h" #include "GameObject.h" #include "GameObjectAI.h" +#include "InstanceScript.h" #include "Map.h" #include "Player.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Emotes { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp index 7fd4c6a95..8c76e1599 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackwing_lair.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp index 67e4a11ba..7647c4061 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackwing_lair.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp index cf611eea9..215ccf0c3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackwing_lair.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Emotes { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index 0b7087b6b..52058cd1f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -4,14 +4,14 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedGossip.h" -#include "ScriptedCreature.h" #include "blackwing_lair.h" #include "GameObject.h" #include "InstanceScript.h" #include "MotionMaster.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "TemporarySummon.h" enum Events diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp index a6ef0fc19..d5e3b8fa1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" #include "blackwing_lair.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum Say { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index e27ded71e..9c10a2707 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "blackwing_lair.h" #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp index 5d0d81777..e64d3905f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp @@ -4,7 +4,6 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "blackwing_lair.h" #include "GameObject.h" #include "InstanceScript.h" @@ -12,9 +11,10 @@ #include "MotionMaster.h" #include "Player.h" #include "ScriptedCreature.h" -#include "TemporarySummon.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" +#include "TemporarySummon.h" DoorData const doorData[] = { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp index c4db76808..6d797382e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -11,10 +11,10 @@ SDComment: SDCategory: Molten Core EndScriptData */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Emotes { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp index 92f36f516..36036c3a8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp @@ -11,10 +11,10 @@ SDComment: Adds NYI SDCategory: Molten Core EndScriptData */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp index e2913fde3..f37c34bd0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp @@ -11,10 +11,10 @@ SDComment: Adds MC NYI SDCategory: Molten Core EndScriptData */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp index e7894a9e1..0aa6d6b5c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp @@ -11,10 +11,10 @@ SDComment: Timers need to be confirmed, Golemagg's Trust need to be checked SDCategory: Molten Core EndScriptData */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Texts { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp index 8e8cfc5f9..6fa227ad5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp @@ -11,10 +11,10 @@ SDComment: SDCategory: Molten Core EndScriptData */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp index 310fd3796..7cd1d293c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp @@ -11,10 +11,10 @@ SDComment: Conflag on ground nyi SDCategory: Molten Core EndScriptData */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Texts { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp index da8b0d966..b4afff501 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp @@ -11,12 +11,12 @@ SDComment: Correct spawning and Event NYI SDCategory: Molten Core EndScriptData */ +#include "molten_core.h" #include "ObjectMgr.h" -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "molten_core.h" -#include "Player.h" +#include "ScriptMgr.h" enum Texts { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp index b4725eebf..c555ad8cf 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp @@ -11,9 +11,9 @@ SDComment: some spells doesnt work correctly SDCategory: Molten Core EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Texts { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp index c8a5aa58f..330150867 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" #include "molten_core.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp index a76ef75db..1eefcc8f3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp @@ -11,10 +11,10 @@ SDComment: Adds NYI SDCategory: Molten Core EndScriptData */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp index 83005185d..a426fb2d1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp @@ -11,11 +11,11 @@ SDComment: Place Holder SDCategory: Molten Core EndScriptData */ +#include "CreatureAI.h" +#include "InstanceScript.h" +#include "molten_core.h" #include "ObjectMgr.h" #include "ScriptMgr.h" -#include "InstanceScript.h" -#include "CreatureAI.h" -#include "molten_core.h" #include "TemporarySummon.h" Position const SummonPositions[10] = diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h index acad8b6bd..e56b7d4b5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h @@ -4,6 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "Player.h" + #ifndef DEF_MOLTEN_CORE_H #define DEF_MOLTEN_CORE_H diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index 9c47e4624..fca8dde94 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spels { diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 1b97e15a6..0a1a46143 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "InstanceScript.h" #include "deadmines.h" +#include "InstanceScript.h" +#include "ScriptMgr.h" class instance_deadmines : public InstanceMapScript { diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index f06c5f2e0..3f232f095 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "Player.h" -#include "SpellScript.h" -#include "ScriptMgr.h" #include "InstanceScript.h" #include "PassiveAI.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "SpellScript.h" class instance_gnomeregan : public InstanceMapScript { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 097b0107a..e90d2363c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "karazhan.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Curator { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index da0d18dea..4a7cc067d 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "karazhan.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum MaidenOfVirtue { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index e29774148..1814681e9 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "karazhan.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" #include "SpellScript.h" -#include "karazhan.h" enum eSay { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index dbf0ad58c..ad4c992e7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "karazhan.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellScript.h" enum Yells diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 39fc6de7a..9bad23b52 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -11,10 +11,10 @@ SDComment: Not sure about timing and portals placing SDCategory: Karazhan EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "karazhan.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Netherspite { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index b988feb49..5ee12a1ed 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -11,10 +11,10 @@ SDComment: SDComment: Timers may incorrect SDCategory: Karazhan EndScriptData */ -#include "Player.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "karazhan.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 5015283de..cc3305a60 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -5,9 +5,9 @@ * Rescripted By Lee (Talamortis) */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "karazhan.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum PrinceSay diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp index d0981fcaf..9b5ae5338 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "karazhan.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum ServantQuartersSpells { 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 50283c693..6afdc9c0c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "karazhan.h" #include "GameObject.h" +#include "karazhan.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum ShadeOfAran diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index aed2fa1be..bf728bf4b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -11,10 +11,10 @@ SDComment: Complete! Needs adjustments to use spell though. SDCategory: Karazhan EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "karazhan.h" #include "PassiveAI.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum TerestianIllhoof { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 9b3633af5..89feef638 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -11,11 +11,11 @@ SDComment: Oz, Hood, and RAJ event implemented. RAJ event requires more testing. SDCategory: Karazhan EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "karazhan.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellInfo.h" /***********************************/ diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 01ad14812..754f72b91 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -1,13 +1,13 @@ -#include "ScriptMgr.h" #include "Creature.h" #include "GameObject.h" #include "InstanceScript.h" #include "karazhan.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" #include "Map.h" #include "Player.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" const Position OptionalSpawn[] = { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index ab6ed20a8..6034fa4e2 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -17,12 +17,12 @@ npc_berthold npc_image_of_medivh EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "karazhan.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h index 424024464..a290ffa55 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h @@ -16,6 +16,8 @@ * with this program. If not, see . */ +#include "CreatureAIImpl.h" + #ifndef DEF_KARAZHAN_H #define DEF_KARAZHAN_H diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 5ea446974..a9c117d6a 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "magisters_terrace.h" -#include "WorldPacket.h" #include "Opcodes.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "WorldPacket.h" enum Says { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index d4a2b29b0..2ea104580 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "magisters_terrace.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index b496b8c40..76cdb07f6 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "magisters_terrace.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index d724cddfd..042256305 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "magisters_terrace.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index 2f853aa8e..29d968d19 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" #include "magisters_terrace.h" +#include "ScriptMgr.h" class instance_magisters_terrace : public InstanceMapScript { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h index df6ea5c87..376e44496 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h @@ -5,8 +5,8 @@ #ifndef DEF_MAGISTERS_TERRACE_H #define DEF_MAGISTERS_TERRACE_H -#include "Player.h" #include "CreatureAI.h" +#include "Player.h" #include "SpellScript.h" enum MTData diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 4a93c794a..380d599eb 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -4,19 +4,19 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "Vehicle.h" -#include "ObjectMgr.h" -#include "ScriptedEscortAI.h" #include "CombatAI.h" -#include "PassiveAI.h" -#include "Player.h" -#include "SpellInfo.h" #include "CreatureTextMgr.h" +#include "ObjectMgr.h" +#include "PassiveAI.h" #include "PetAI.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SpellInfo.h" #include "SpellScript.h" +#include "Vehicle.h" // Ours enum eyeOfAcherus diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index e8491af74..3d32ab083 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -4,13 +4,13 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" +#include "CombatAI.h" +#include "CreatureTextMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "Player.h" +#include "ScriptMgr.h" #include "SpellInfo.h" -#include "CreatureTextMgr.h" -#include "CombatAI.h" #include "SpellScript.h" //How to win friends and influence enemies diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 6cac84944..c812b79fc 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellScript.h" enum LightOfDawnSays diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp index a7327b318..e87619520 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" /*#### ## npc_valkyr_battle_maiden diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 8431a31b5..9cbba6268 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -4,10 +4,10 @@ REWRITTEN BY XINEF */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "SmartAI.h" #include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SmartAI.h" enum AshbringerEventMisc { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 50ad17671..786ba1579 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -2,12 +2,12 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "scholomance.h" -#include "MoveSplineInit.h" #include "GameObjectAI.h" +#include "MoveSplineInit.h" #include "Player.h" +#include "scholomance.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index b3e43c1f7..5203c9fec 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -2,13 +2,13 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "Player.h" #include "scholomance.h" -#include "GameObjectAI.h" -#include "SpellScript.h" +#include "ScriptMgr.h" #include "SpellAuras.h" +#include "SpellScript.h" class instance_scholomance : public InstanceMapScript { diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index f0239a5dd..e8ee789cd 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" +#include "ScriptMgr.h" #include "shadowfang_keep.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 82cf81abf..2abe9db04 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "InstanceScript.h" -#include "stratholme.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "stratholme.h" const Position BlackGuardPos[10] = { diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index eee5734ee..863539e4d 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -2,12 +2,12 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "InstanceScript.h" -#include "sunken_temple.h" -#include "Player.h" #include "CreatureAI.h" +#include "InstanceScript.h" +#include "Player.h" +#include "ScriptMgr.h" #include "SpellScript.h" +#include "sunken_temple.h" class instance_sunken_temple : public InstanceMapScript { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index cf11c1361..04cd95ce5 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "sunwell_plateau.h" enum Quotes diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index af6df1965..70a8efdcc 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "sunwell_plateau.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "sunwell_plateau.h" enum Quotes { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 2b050978b..7a0aca478 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -2,12 +2,12 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" #include "Cell.h" #include "CellImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "sunwell_plateau.h" enum Yells diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index fbdac7c26..e4f9b9a75 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "sunwell_plateau.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "sunwell_plateau.h" #include "WorldSession.h" enum Yells diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 029b4be8c..def7c8cbb 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "sunwell_plateau.h" -#include "MoveSplineInit.h" #include "CreatureTextMgr.h" +#include "MoveSplineInit.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "sunwell_plateau.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index af9f6cd38..10299fb2b 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "sunwell_plateau.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "sunwell_plateau.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index 7d039977e..f4435f22d 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" #include "Player.h" +#include "ScriptMgr.h" #include "sunwell_plateau.h" DoorData const doorData[] = diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h index a601c0b82..20c037bd0 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h @@ -5,11 +5,11 @@ #ifndef SUNWELL_PLATEAU_H #define SUNWELL_PLATEAU_H -#include "Player.h" -#include "SpellScript.h" -#include "PassiveAI.h" -#include "SpellAuraEffects.h" #include "CreatureAIImpl.h" +#include "PassiveAI.h" +#include "Player.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum DataTypes { diff --git a/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp b/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp index 2547a4dfd..c967841d3 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp +++ b/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" +#include "ScriptMgr.h" class instance_the_stockade : public InstanceMapScript { diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 195c13b88..7e04354d7 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "InstanceScript.h" -#include "SpellScript.h" #include "CreatureAI.h" +#include "InstanceScript.h" +#include "ScriptMgr.h" +#include "SpellScript.h" #include "uldaman.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 3799ed7c8..4f72d5d4b 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -13,14 +13,14 @@ SQLUpdate: EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" #include "Cell.h" #include "CellImpl.h" -#include "zulaman.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "Weather.h" +#include "zulaman.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 55d624ea8..3353c72ad 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "zulaman.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "zulaman.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index f51f7a095..198ab0cdd 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -10,10 +10,10 @@ SDComment: SDCategory: Zul'Aman EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "SpellScript.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" #include "zulaman.h" enum Says diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 3e69bc7c1..ab0c6ca95 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -11,11 +11,11 @@ SDComment: SDCategory: Zul'Aman EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "zulaman.h" -#include "GridNotifiers.h" #include "CellImpl.h" +#include "GridNotifiers.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "zulaman.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index 4c195391f..e3b661afe 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -11,12 +11,12 @@ SDComment: SDCategory: Zul'Aman EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "zulaman.h" +#include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "CellImpl.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "zulaman.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 44f210642..a2e00f701 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -10,10 +10,10 @@ SD%Complete: 85% SDComment: EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "zulaman.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "zulaman.h" enum Says { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index 5b26936df..8bf1b4c5f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -11,11 +11,11 @@ SDComment: SDCategory: Zul'Aman EndScriptData */ -#include "ScriptMgr.h" #include "InstanceScript.h" -#include "zulaman.h" #include "Player.h" +#include "ScriptMgr.h" #include "TemporarySummon.h" +#include "zulaman.h" enum Misc { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index f3a54e22f..29a3e15e3 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -15,13 +15,13 @@ EndScriptData */ npc_forest_frog EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "zulaman.h" -#include "Player.h" +#include "ScriptMgr.h" #include "SpellInfo.h" #include "SpellScript.h" +#include "zulaman.h" /*###### ## npc_forest_frog diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 3343291ef..4a1f9ef4c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -13,8 +13,8 @@ TCComment: Can't test LOS until mmaps. TCCategory: Zul'Gurub EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" #include "zulgurub.h" diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp index e634d866e..4f4896e79 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp @@ -11,8 +11,8 @@ SDComment: Massive Geyser with knockback not working. Spell buggy. SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "zulgurub.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index 150085bb9..ba5b48368 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -11,8 +11,8 @@ SDComment: SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "zulgurub.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index 5619fa256..677adccb4 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -11,8 +11,8 @@ Comment: Blood siphon spell buggy cause of Core Issue. Category: Zul'Gurub */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "zulgurub.h" enum Says diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index fcdcb14a7..5d9236b81 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -11,8 +11,8 @@ SDComment: SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "zulgurub.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 2918f0af3..3414639c4 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "zulgurub.h" enum Says diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index bbd4d7416..6437af085 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -11,8 +11,8 @@ SDComment: Mind Control not working because of core bug. Shades visible for all. SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "zulgurub.h" enum Say diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 980b048ae..ce57058de 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -11,8 +11,8 @@ SDComment: Ohgan function needs improvements. SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "Spell.h" #include "SpellAuras.h" #include "SpellScript.h" diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index 54154b603..1420d5957 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -11,8 +11,8 @@ SDComment: Charging healers and casters not working. Perhaps wrong Spell Timers. SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "zulgurub.h" enum Says diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index 3f5f53a50..393adcf5e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -11,8 +11,8 @@ SDComment: SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "zulgurub.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index acc23a111..a6e8cd82a 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -11,8 +11,8 @@ SDComment: Almost finished. SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "zulgurub.h" enum Says diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index c3d95a93e..153c484fe 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -5,8 +5,8 @@ */ #include "ObjectMgr.h" -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "Spell.h" #include "zulgurub.h" diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index b691957da..67d203081 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -11,8 +11,8 @@ SDComment: SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "zulgurub.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index af7672e13..432e58e57 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp @@ -11,8 +11,8 @@ SDComment: Missing reset function after killing a boss for Ohgan, Thekal. SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptMgr.h" #include "InstanceScript.h" +#include "ScriptMgr.h" #include "zulgurub.h" DoorData const doorData[] = diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp index 2a1b39e8f..e75c4c6a2 100644 --- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp @@ -15,10 +15,10 @@ EndScriptData */ npc_professor_phizzlethorpe EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "Player.h" +#include "ScriptMgr.h" /*###### ## npc_professor_phizzlethorpe diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp index 020a0eb8d..abcf305ac 100644 --- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp @@ -9,12 +9,12 @@ Blasted_Lands Quest support: 3628. Teleporter to Rise of the Defiler. */ -#include "ScriptMgr.h" +#include "Group.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellScript.h" -#include "Player.h" -#include "Group.h" /*##### # spell_razelikh_teleport_group diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index ca1f6e64e..46f3f1fbb 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -11,9 +11,9 @@ SDComment: Quest Support:8735 SDCategory: Duskwood EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum TwilightCorrupter { diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index a3a7b2594..c014781d6 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -18,13 +18,13 @@ npc_darrowshire_spirit npc_tirion_fordring EndContentData */ -#include "ScriptMgr.h" +#include "PassiveAI.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "Player.h" -#include "WorldSession.h" -#include "PassiveAI.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "WorldSession.h" // Ours diff --git a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp index d93fb7e4c..e6399974f 100644 --- a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp @@ -15,11 +15,11 @@ EndScriptData */ npc_ranger_lilatha EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "WorldSession.h" /*###### diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index f48fbc0ee..cf0c49bd4 100644 --- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp @@ -16,10 +16,10 @@ npc_oox09hl npc_rinji EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "Player.h" +#include "ScriptMgr.h" /*###### ## npc_oox09hl diff --git a/src/server/scripts/EasternKingdoms/zone_ironforge.cpp b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp index 10172d238..b11d2912b 100644 --- a/src/server/scripts/EasternKingdoms/zone_ironforge.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "Player.h" +#include "ScriptMgr.h" void AddSC_ironforge() { } diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index bbc403304..5c023fab8 100644 --- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp @@ -16,12 +16,12 @@ npc_converted_sentry npc_greengill_slave EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "Player.h" -#include "Pet.h" -#include "SpellInfo.h" #include "PassiveAI.h" +#include "Pet.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellInfo.h" #include "SpellScript.h" /*###### OUR: ######*/ diff --git a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp index 84acfd8bb..477681d5f 100644 --- a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp @@ -10,10 +10,10 @@ SD%Complete: 100% SDComment: Support for quest 219. Script Data End */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "Player.h" +#include "ScriptMgr.h" enum CorporalKeeshan { diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index 3ab58e638..a7fa25e97 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -16,10 +16,10 @@ npc_deathstalker_erland pyrewood_ambush EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "Player.h" +#include "ScriptMgr.h" /*###### ## npc_deathstalker_erland diff --git a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp index 38c5953b6..1e8adac74 100644 --- a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp @@ -20,11 +20,11 @@ npc_marzon_silent_blade npc_lord_gregor_lescovar EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" /*###### ## npc_bartleby diff --git a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp index 5cf21b1ab..c39629af3 100644 --- a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp @@ -15,9 +15,9 @@ EndScriptData */ npc_yenniku EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" /*###### diff --git a/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp index ab664e335..6097cbca1 100644 --- a/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp +++ b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "Player.h" +#include "ScriptMgr.h" /*###### ## npc_galen_goodward diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp index dff34e34a..0190af2da 100644 --- a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp @@ -17,9 +17,9 @@ go_mausoleum_door go_mausoleum_trigger EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" /*###### ## npc_calvin_montague diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index fc99d04d8..e48eb3e7a 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -17,15 +17,15 @@ npc_highborne_lamenter npc_parqual_fintallas EndContentData */ -#include "Player.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "SpellAuras.h" #include "ObjectAccessor.h" -#include "SpellScript.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellScript.h" /*###### ## npc_lady_sylvanas_windrunner diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index 06de75cc9..8215e51ff 100644 --- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp @@ -18,11 +18,11 @@ npc_the_scourge_cauldron npc_andorhal_tower EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "WorldSession.h" /*###### diff --git a/src/server/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp index 1c1e37993..6c95a915a 100644 --- a/src/server/scripts/EasternKingdoms/zone_westfall.cpp +++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp @@ -15,10 +15,10 @@ EndScriptData */ npc_daphne_stilwell EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "Player.h" +#include "ScriptMgr.h" /*###### ## npc_daphne_stilwell diff --git a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp index 8a8f055e6..888e39963 100644 --- a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp @@ -16,10 +16,10 @@ npc_mikhail npc_tapoke_slim_jahn EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "Player.h" +#include "ScriptMgr.h" /*###### ## npc_tapoke_slim_jahn diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp index 582362cba..c9aec13ef 100644 --- a/src/server/scripts/Events/brewfest.cpp +++ b/src/server/scripts/Events/brewfest.cpp @@ -1,17 +1,17 @@ // Scripted by Xinef -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "SpellAuras.h" -#include "SpellAuraEffects.h" -#include "GridNotifiers.h" -#include "SpellScript.h" +#include "CellImpl.h" #include "GameEventMgr.h" +#include "GridNotifiers.h" #include "Group.h" #include "LFGMgr.h" #include "PassiveAI.h" -#include "CellImpl.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellScript.h" /////////////////////////////////////// ////// GOS diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 248018005..177e1b78e 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellAuras.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" enum Orphans { diff --git a/src/server/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp index e6bdaa270..822f20092 100644 --- a/src/server/scripts/Events/hallows_end.cpp +++ b/src/server/scripts/Events/hallows_end.cpp @@ -1,15 +1,15 @@ // Scripted by Xinef -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellAuraEffects.h" -#include "GridNotifiers.h" +#include "CellImpl.h" #include "GossipDef.h" -#include "SpellScript.h" +#include "GridNotifiers.h" +#include "Group.h" #include "LFGMgr.h" #include "PassiveAI.h" -#include "Group.h" -#include "CellImpl.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" /////////////////////////////////////// ////// ITEMS FIXES, BASIC STUFF diff --git a/src/server/scripts/Events/love_in_air.cpp b/src/server/scripts/Events/love_in_air.cpp index 4164a7b4a..b4bc7bdb2 100644 --- a/src/server/scripts/Events/love_in_air.cpp +++ b/src/server/scripts/Events/love_in_air.cpp @@ -1,15 +1,15 @@ // Scripted by Xinef -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" #include "Cell.h" #include "CellImpl.h" -#include "SpellScript.h" -#include "LFGMgr.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "Group.h" +#include "LFGMgr.h" #include "PassiveAI.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" /////////////////////////////////////// ////// GOS diff --git a/src/server/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp index 225337a2e..c7c6197de 100644 --- a/src/server/scripts/Events/midsummer.cpp +++ b/src/server/scripts/Events/midsummer.cpp @@ -1,12 +1,12 @@ // Scripted by Xinef -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "Spell.h" #include "SpellAuras.h" #include "SpellScript.h" -#include "Player.h" enum eBonfire { diff --git a/src/server/scripts/Events/pilgrims_bounty.cpp b/src/server/scripts/Events/pilgrims_bounty.cpp index d3f1a868e..0d39807fc 100644 --- a/src/server/scripts/Events/pilgrims_bounty.cpp +++ b/src/server/scripts/Events/pilgrims_bounty.cpp @@ -1,13 +1,13 @@ // Scripted by Xinef -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellAuraEffects.h" #include "CombatAI.h" -#include "SpellScript.h" -#include "Player.h" -#include "Vehicle.h" #include "PassiveAI.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" +#include "Vehicle.h" /////////////////////////////////////// ////// TABLE EVENT diff --git a/src/server/scripts/Events/winter_veil.cpp b/src/server/scripts/Events/winter_veil.cpp index 5afb80aa9..72466642f 100644 --- a/src/server/scripts/Events/winter_veil.cpp +++ b/src/server/scripts/Events/winter_veil.cpp @@ -1,11 +1,11 @@ // Scripted by Xinef -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "Spell.h" -#include "SpellScript.h" #include "GameEventMgr.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Spell.h" +#include "SpellScript.h" /////////////////////////////// // SPELLS diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index c066cc50d..e99cd664e 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "InstanceScript.h" #include "blackfathom_deeps.h" +#include "InstanceScript.h" +#include "ScriptMgr.h" class instance_blackfathom_deeps : public InstanceMapScript { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 2b41ee488..b4042498a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "hyjal.h" #include "hyjal_trash.h" +#include "hyjal.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index a688cfd90..ff5a3b411 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -11,12 +11,12 @@ SDComment: Doomfires not completely offlike due to core limitations for random m SDCategory: Caverns of Time, Mount Hyjal EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "hyjal.h" -#include "SpellAuras.h" #include "hyjal_trash.h" +#include "hyjal.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" #include "SpellScript.h" enum Texts diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index a7bb7ef9c..deac5f91f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "hyjal.h" #include "hyjal_trash.h" +#include "hyjal.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 0df0a90b8..04f6ca1b8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" +#include "hyjal_trash.h" +#include "hyjal.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" -#include "hyjal.h" -#include "hyjal_trash.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 36935b9b8..102091d46 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "hyjal.h" #include "hyjal_trash.h" +#include "hyjal.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 02c5b2a1c..f731e0d51 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -17,11 +17,11 @@ npc_thrall npc_tyrande_whisperwind EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "hyjalAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #define GOSSIP_ITEM_BEGIN_ALLY "My companions and I are with you, Lady Proudmoore." #define GOSSIP_ITEM_ANETHERON "We are ready for whatever Archimonde might send our way, Lady Proudmoore." diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 37f21e9a0..ae6b8db9e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -11,15 +11,15 @@ SDComment: SDCategory: Caverns of Time, Mount Hyjal EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedEscortAI.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" #include "Cell.h" #include "CellImpl.h" -#include "hyjalAI.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "hyjal_trash.h" +#include "hyjalAI.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptMgr.h" enum Spawns { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index fb3ee7f8e..32adc0fa1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "hyjal.h" #include "hyjal_trash.h" +#include "hyjal.h" #include "hyjalAI.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 8751a7e72..b1314b7ed 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -11,14 +11,14 @@ SDComment: Instance Data Scripts and functions to acquire mobs and set encounter SDCategory: Caverns of Time, Mount Hyjal EndScriptData */ -#include "ScriptMgr.h" -#include "InstanceScript.h" -#include "ScriptedCreature.h" -#include "hyjal_trash.h" -#include "Player.h" -#include "WorldPacket.h" -#include "Opcodes.h" #include "Chat.h" +#include "hyjal_trash.h" +#include "InstanceScript.h" +#include "Opcodes.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "WorldPacket.h" /* Battle of Mount Hyjal encounters: 0 - Rage Winterchill event diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 915203a66..4f1985534 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "culling_of_stratholme.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum Spells diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp index fc2e14f08..b8c04e6aa 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "culling_of_stratholme.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 0e69f07bb..36d5120b8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "culling_of_stratholme.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 1d9868ac9..a391add96 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "culling_of_stratholme.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index ee0acb534..6ff818f06 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "culling_of_stratholme.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellScript.h" enum Spells diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 2e8818dfe..eff9ffa82 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -2,13 +2,13 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "culling_of_stratholme.h" -#include "ScriptedEscortAI.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum Says diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h index 2b9be7906..41ae5dc7f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h @@ -2,6 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ +#include "CreatureAIImpl.h" + #ifndef DEF_CULLING_OF_STRATHOLME_H #define DEF_CULLING_OF_STRATHOLME_H diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 960ebf737..d9766774a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -2,13 +2,13 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "CreatureTextMgr.h" #include "culling_of_stratholme.h" #include "Player.h" -#include "TemporarySummon.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "TemporarySummon.h" class instance_culling_of_stratholme : public InstanceMapScript { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index 9a913b8a8..52edd563c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "old_hillsbrad.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum CaptainSkarloc { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 9fb5d5030..351c8f978 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "old_hillsbrad.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum EpochHunter { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp index 36e82c3f4..4ea788d3a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "old_hillsbrad.h" #include "MoveSplineInit.h" +#include "old_hillsbrad.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SmartScriptMgr.h" enum LieutenantDrake diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 2a0750f2d..1f30e53b6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "InstanceScript.h" #include "old_hillsbrad.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" const Position instancePositions[INSTANCE_POSITIONS_COUNT] = { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index b366e1ff2..b4b27de0d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -2,12 +2,12 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "old_hillsbrad.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" /*enum Erozion { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp index dc349defc..d2a25d524 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "the_black_morass.h" enum Enums diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index c8142e643..cdcf02d2e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "the_black_morass.h" enum Enums diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index 088f5b493..2d1c58fa1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "the_black_morass.h" enum Enums diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp index 3d3644e9c..03f2e6956 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp @@ -2,13 +2,13 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" -#include "the_black_morass.h" #include "Player.h" -#include "TemporarySummon.h" -#include "SpellInfo.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellInfo.h" +#include "TemporarySummon.h" +#include "the_black_morass.h" const Position PortalLocation[4] = { 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 10ac0f013..17cff25a9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "MoveSplineInit.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "the_black_morass.h" -#include "MoveSplineInit.h" enum medivhSays { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h index 221d79d1a..1aff71c3d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h @@ -5,8 +5,8 @@ #ifndef DEF_THEBLACKMORASS_H #define DEF_THEBLACKMORASS_H -#include "SpellScript.h" #include "PassiveAI.h" +#include "SpellScript.h" enum DataTypes { diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp index 68e644e00..b008dd22d 100644 --- a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp +++ b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "InstanceScript.h" #include "dire_maul.h" +#include "InstanceScript.h" +#include "ScriptMgr.h" class instance_dire_maul : public InstanceMapScript { diff --git a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp index 46ce883a3..6466fc8a8 100644 --- a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" #include "maraudon.h" +#include "ScriptMgr.h" class instance_maraudon : public InstanceMapScript { diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index e823432aa..303ec77b4 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -2,10 +2,10 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "onyxias_lair.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum // Spells diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 2cad63a4b..a446a2927 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -2,9 +2,9 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "onyxias_lair.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" class instance_onyxias_lair : public InstanceMapScript { diff --git a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp index 1c4ab0d54..f18cdfd18 100644 --- a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp +++ b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" +#include "ScriptMgr.h" class instance_ragefire_chasm : public InstanceMapScript { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index cbdb2b332..5147bd499 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ObjectMgr.h" #include "InstanceScript.h" +#include "ObjectMgr.h" #include "razorfen_downs.h" +#include "ScriptMgr.h" class instance_razorfen_downs : public InstanceMapScript { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 89ac7dd6f..a7a03cb27 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -2,15 +2,15 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "razorfen_downs.h" -#include "Player.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" #include "Cell.h" #include "CellImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "Player.h" +#include "razorfen_downs.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" /*###### ## npc_belnistrasz for Quest 3525 "Extinguishing the Idol" diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 85dd553a6..2c5ad32b0 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" +#include "ScriptMgr.h" class instance_razorfen_kraul : public InstanceMapScript { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index 3a49833d6..521650be8 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "Player.h" #include "ruins_of_ahnqiraj.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index 70793f70a..fa5988364 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" #include "ruins_of_ahnqiraj.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum Emotes { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 2440db24a..5da0e4106 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ruins_of_ahnqiraj.h" #include "CreatureTextMgr.h" +#include "ObjectMgr.h" +#include "ruins_of_ahnqiraj.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 50ffe8672..9ef8803db 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "ruins_of_ahnqiraj.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Texts { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index 2265595cd..7eab9509d 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -4,13 +4,13 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ruins_of_ahnqiraj.h" +#include "Opcodes.h" #include "Player.h" +#include "ruins_of_ahnqiraj.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" #include "WorldPacket.h" -#include "Opcodes.h" enum Texts { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index 77445b382..77609c777 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -5,9 +5,9 @@ */ #include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "ruins_of_ahnqiraj.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp index c6e5f87c7..1e6ebef72 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "InstanceScript.h" #include "ruins_of_ahnqiraj.h" +#include "ScriptMgr.h" class instance_ruins_of_ahnqiraj : public InstanceMapScript { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index a252ff720..2f57ff7f9 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -11,8 +11,8 @@ SDComment: SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "temple_of_ahnqiraj.h" enum Spells diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 7f8f25c04..a10932ced 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -11,10 +11,10 @@ SDComment: Darkglare tracking issue SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "temple_of_ahnqiraj.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "temple_of_ahnqiraj.h" /* * This is a 2 phases events. Here follows an explanation of the main events and transition between phases and sub-phases. diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index be14ffda0..9006e5a1d 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -11,8 +11,8 @@ SDComment: sound not implemented SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #define SOUND_SENTENCE_YOU 8588 #define SOUND_SERVE_TO 8589 diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 9c540eba8..15cf4afc3 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -11,8 +11,8 @@ SDComment: SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Huhuran { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 59d9b5401..17b8e2c3f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -11,8 +11,8 @@ SDComment: No model for submerging. Currently just invisible. SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "temple_of_ahnqiraj.h" enum Spells diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 286f39713..cd2934f7a 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -11,8 +11,8 @@ SDComment: SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Sartura { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index f6c536f24..c4a9d2b76 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellScript.h" #include "temple_of_ahnqiraj.h" diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index d90b722e9..e04ee089c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -11,12 +11,12 @@ SDComment: SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptMgr.h" +#include "Item.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Spell.h" #include "temple_of_ahnqiraj.h" #include "WorldPacket.h" -#include "Item.h" -#include "Spell.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index 881384a13..fd1ec29a9 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" #include "temple_of_ahnqiraj.h" diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index 7e660b5fe..d713a45a2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -11,8 +11,8 @@ SDComment: SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptMgr.h" #include "InstanceScript.h" +#include "ScriptMgr.h" #include "temple_of_ahnqiraj.h" class instance_temple_of_ahnqiraj : public InstanceMapScript diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 7009037b3..7f0b13ac3 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -11,18 +11,16 @@ SDComment: Shadow storm is not properly implemented in core it should only targe SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "WorldPacket.h" - -#include "Item.h" -#include "Player.h" -#include "Spell.h" - #include "Cell.h" #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" +#include "Item.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Spell.h" +#include "WorldPacket.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index 80d90f1f8..91eabb049 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" +#include "ScriptMgr.h" #include "wailing_caverns.h" class instance_wailing_caverns : public InstanceMapScript diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index f9e3544b6..891ca463f 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -2,13 +2,13 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "InstanceScript.h" -#include "zulfarrak.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" +#include "InstanceScript.h" #include "Player.h" +#include "ScriptMgr.h" #include "TemporarySummon.h" +#include "zulfarrak.h" class instance_zulfarrak : public InstanceMapScript { diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h index ee472a7f9..d63813273 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h @@ -5,8 +5,8 @@ #ifndef DEF_ZULFARRACK_H #define DEF_ZULFARRACK_H -#include "SpellScript.h" #include "CellImpl.h" +#include "SpellScript.h" enum ZulFarrakData { diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index ea997cf75..101a04f90 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -11,8 +11,8 @@ SDComment: Teleport not included, spell reflect not effecting dots (Core problem SDCategory: Azshara EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Say { diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index ccd45096d..b13fe05d4 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -15,10 +15,10 @@ EndScriptData */ npc_ruul_snowhoof EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "Player.h" +#include "ScriptMgr.h" /*#### # npc_ruul_snowhoof diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp index e70fc6552..68c4eb543 100644 --- a/src/server/scripts/Kalimdor/zone_azshara.cpp +++ b/src/server/scripts/Kalimdor/zone_azshara.cpp @@ -17,10 +17,10 @@ npc_rizzle_sprysprocket npc_depth_charge EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "Player.h" +#include "ScriptMgr.h" #include "SpellInfo.h" /*###### diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 838055567..8e790aad4 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -20,14 +20,14 @@ go_ravager_cage npc_death_ravager EndContentData */ -#include "ScriptMgr.h" +#include "Cell.h" +#include "CellImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "Cell.h" -#include "CellImpl.h" -#include "GridNotifiersImpl.h" -#include "GridNotifiers.h" +#include "ScriptMgr.h" /*###### ## npc_draenei_survivor diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 6129fe447..fad1e9b7c 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -15,9 +15,9 @@ EndScriptData */ npc_webbed_creature EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" /*###### ## npc_webbed_creature diff --git a/src/server/scripts/Kalimdor/zone_darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp index bf1e03853..b1375c25d 100644 --- a/src/server/scripts/Kalimdor/zone_darkshore.cpp +++ b/src/server/scripts/Kalimdor/zone_darkshore.cpp @@ -16,12 +16,12 @@ npc_kerlonian npc_prospector_remtravel EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "ScriptedEscortAI.h" #include "ScriptedFollowerAI.h" -#include "Player.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellInfo.h" // Ours diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index a574e484f..616c536c9 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -17,11 +17,11 @@ npc_dalinda_malem go_demon_portal EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellInfo.h" // Ours diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index 68d729d0b..c2ea26e5d 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -4,11 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "Vehicle.h" -#include "SpellScript.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" +#include "Vehicle.h" enum Texts { diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index ef1288a51..60434d3f6 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -18,12 +18,12 @@ npc_private_hendel npc_cassa_crimsonwing - handled by npc_taxi EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellScript.h" -#include "Player.h" #include "WorldSession.h" /*###### diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp index 3d7d79e17..812b89e85 100644 --- a/src/server/scripts/Kalimdor/zone_felwood.cpp +++ b/src/server/scripts/Kalimdor/zone_felwood.cpp @@ -15,10 +15,10 @@ EndScriptData */ npcs_riverbreeze_and_silversky EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "Player.h" +#include "ScriptMgr.h" /*###### ## npcs_riverbreeze_and_silversky diff --git a/src/server/scripts/Kalimdor/zone_feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp index fe9125fbd..c59e3c8c1 100644 --- a/src/server/scripts/Kalimdor/zone_feralas.cpp +++ b/src/server/scripts/Kalimdor/zone_feralas.cpp @@ -11,12 +11,12 @@ SDComment: Quest support: 3520, 2767, Special vendor Gregan Brewspewer SDCategory: Feralas EndScriptData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellScript.h" -#include "Player.h" #include "WorldSession.h" /*###### diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index a80180049..4b3973538 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -19,16 +19,16 @@ npc_clintar_spirit npc_clintar_dreamwalker EndContentData */ -#include "ScriptMgr.h" +#include "Cell.h" +#include "CellImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "Player.h" +#include "ScriptMgr.h" #include "SpellInfo.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" -#include "Cell.h" -#include "CellImpl.h" /*###### ## npc_bunthen_plainswind diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp index b025c8b1a..4513d77b5 100644 --- a/src/server/scripts/Kalimdor/zone_mulgore.cpp +++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "Player.h" +#include "ScriptMgr.h" #include "SpellInfo.h" void AddSC_mulgore() diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp index 976ef3092..83084b8ff 100644 --- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp @@ -16,10 +16,10 @@ npc_shenthul npc_thrall_warchief EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "Player.h" +#include "ScriptMgr.h" /*###### ## npc_shenthul diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index ca321eea6..060b700d0 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -16,15 +16,15 @@ npcs_rutgar_and_frankal quest_a_pawn_on_the_eternal_pawn EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" +#include "AccountMgr.h" +#include "BanManager.h" #include "Group.h" #include "Player.h" -#include "AccountMgr.h" -#include "SpellInfo.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "Spell.h" -#include "BanManager.h" +#include "SpellInfo.h" /*### ## npcs_rutgar_and_frankal diff --git a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp index db7037fb6..61b8589bf 100644 --- a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp @@ -16,11 +16,11 @@ npc_braug_dimspirit npc_kaya_flathoof EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" /*###### ## npc_braug_dimspirit diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 17746d979..dcc4aba15 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -20,12 +20,12 @@ npc_OOX17 npc_tooga EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "ScriptedEscortAI.h" #include "ScriptedFollowerAI.h" -#include "Player.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "WorldSession.h" /*###### diff --git a/src/server/scripts/Kalimdor/zone_teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp index 4c6a71599..4e14ef65f 100644 --- a/src/server/scripts/Kalimdor/zone_teldrassil.cpp +++ b/src/server/scripts/Kalimdor/zone_teldrassil.cpp @@ -15,10 +15,10 @@ EndScriptData */ npc_mist EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedFollowerAI.h" -#include "Player.h" +#include "ScriptMgr.h" void AddSC_teldrassil() { diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index e7b08a759..a58f043c7 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -20,11 +20,11 @@ npc_twiggy_flathead npc_wizzlecrank_shredder EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellInfo.h" /*###### diff --git a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp index 0d2968179..e980f9818 100644 --- a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp @@ -19,11 +19,11 @@ npc_enraged_panther go_panther_cage EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" /*###### # npc_lakota_windsong diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index b73ea4969..680e06070 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -11,10 +11,10 @@ SDComment: Quest support: 925 SDCategory: Thunder Bluff EndScriptData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "Player.h" +#include "ScriptMgr.h" /*##### # npc_cairne_bloodhoof diff --git a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp index 773b40f6e..9db2f1e6a 100644 --- a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp @@ -16,11 +16,11 @@ npc_a-me npc_ringo EndContentData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedFollowerAI.h" -#include "Player.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum AmeData diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index 50d266802..5da06d489 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -17,11 +17,11 @@ npc_ranshalla go_elune_fire EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "WorldSession.h" // Ours diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h index a7c5492ca..9e6a684ff 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h @@ -5,9 +5,9 @@ #ifndef DEF_AZJOL_NERUB_H #define DEF_AZJOL_NERUB_H -#include "SpellScript.h" -#include "SpellAuras.h" #include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellScript.h" enum ANData { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 1bec71d51..6d3d1a80d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "azjol_nerub.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index d9c42a4d3..363e02518 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "azjol_nerub.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index d72b4efc5..d2340aaec 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "azjol_nerub.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index 34af34750..66bb0f4ed 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "azjol_nerub.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 219977291..b38db383d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "ahnkahet.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp index 1054d4cdd..b1aa61036 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "ahnkahet.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index 8077b8b6f..4c6222c90 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "ahnkahet.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum Spells diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 03ba422a9..97e385636 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "ahnkahet.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index 8f841dabd..6ec38959e 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "ahnkahet.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum Spells diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index 867fe426d..66c03e3b2 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" -#include "Player.h" #include "ahnkahet.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" class instance_ahnkahet : public InstanceMapScript { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 7776fd6e4..97c5c0c9e 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "obsidian_sanctum.h" -#include "SpellScript.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellAuras.h" +#include "SpellScript.h" enum Says { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index 4f12928a1..b87a87bca 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -2,10 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" +#include "CreatureAIImpl.h" #include "obsidian_sanctum.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" class instance_obsidian_sanctum : public InstanceMapScript { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h index 8c0dc705b..4b9154ac8 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h @@ -2,6 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ +#include "CreatureAIImpl.h" + #ifndef DEF_OBSIDIAN_SANCTUM_H #define DEF_OBSIDIAN_SANCTUM_H diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index c8ea4d0aa..c56dba24d 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -3,10 +3,10 @@ */ #include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellAuraEffects.h" #include "ruby_sanctum.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" enum Texts { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp index 1b8ec2dd8..075100c25 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "ruby_sanctum.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ruby_sanctum.h" +#include "ScriptMgr.h" enum Texts { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 532f9f564..2002f37ca 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -2,16 +2,16 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" -#include "Spell.h" -#include "Vehicle.h" -#include "MapManager.h" #include "GameObjectAI.h" -#include "ScriptedCreature.h" -#include "ruby_sanctum.h" +#include "MapManager.h" #include "Player.h" +#include "ruby_sanctum.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Spell.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" +#include "Vehicle.h" enum Texts { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index bfc28b644..d8a456b3b 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "ruby_sanctum.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Texts { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index c5dc09ff5..28001afff 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" -#include "ruby_sanctum.h" #include "Player.h" +#include "ruby_sanctum.h" +#include "ScriptMgr.h" #include "TemporarySummon.h" #include "WorldPacket.h" diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h index 5eb3e0905..3457ef6fc 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h @@ -5,13 +5,13 @@ #ifndef RUBY_SANCTUM_H_ #define RUBY_SANCTUM_H_ -#include "Player.h" -#include "SpellScript.h" -#include "Map.h" #include "Creature.h" #include "GameObjectAI.h" -#include "PassiveAI.h" +#include "Map.h" #include "Opcodes.h" +#include "PassiveAI.h" +#include "Player.h" +#include "SpellScript.h" enum DataTypes { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 36574866a..6d936427a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "trial_of_the_champion.h" #include "ScriptedEscortAI.h" +#include "ScriptMgr.h" #include "SpellScript.h" +#include "trial_of_the_champion.h" enum EadricSpells { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 48387ad5b..13be5e70d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "trial_of_the_champion.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "trial_of_the_champion.h" enum Spells { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 47e94e101..00b70bf1c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -2,14 +2,14 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedEscortAI.h" -#include "Vehicle.h" -#include "trial_of_the_champion.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "trial_of_the_champion.h" +#include "Vehicle.h" enum MountSpells { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 0d7ca2ee3..cb9aa529e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -2,12 +2,12 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "Group.h" +#include "Player.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "trial_of_the_champion.h" #include "Vehicle.h" -#include "Player.h" -#include "Group.h" const Position SpawnPosition = {746.67f, 684.08f, 412.5f, 4.65f}; #define CLEANUP_CHECK_INTERVAL 5000 diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 3e95115c7..4baba8568 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "trial_of_the_champion.h" -#include "Player.h" #define GOSSIP_START_EVENT1a "I am ready." #define GOSSIP_START_EVENT1b "I am ready. However I'd like to skip the pageantry." diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 67e410679..bf7ab2085 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -2,12 +2,12 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "trial_of_the_crusader.h" -#include "SpellScript.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" +#include "trial_of_the_crusader.h" enum AnubTexts { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index b38d32b87..bfa8179fd 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "trial_of_the_crusader.h" -#include "SpellScript.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" +#include "trial_of_the_crusader.h" enum eAIs { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index e121c6c1a..9d7ead33c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "trial_of_the_crusader.h" -#include "SpellScript.h" +#include "ScriptMgr.h" #include "SpellAuras.h" +#include "SpellScript.h" +#include "trial_of_the_crusader.h" enum JaraxxusTexts { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index d3c36a250..2b34cca36 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "trial_of_the_crusader.h" #include "Vehicle.h" -#include "Player.h" /*********** ** GORMOK diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index ed0309048..46403f50f 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -3,14 +3,14 @@ (!) ACTUALLY FJOLA CONTROLLS THE WHOLE FIGHT (SPECIAL ABILITIES, SHARED HEALTH, ETC.) SINCE THEY DIE SIMULTANEOUSLY */ -#include "ScriptMgr.h" +#include "PassiveAI.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "trial_of_the_crusader.h" -#include "SpellScript.h" -#include "PassiveAI.h" +#include "ScriptMgr.h" #include "SpellAuras.h" -#include "Player.h" +#include "SpellScript.h" +#include "trial_of_the_crusader.h" enum Yells { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index d972e8e50..054820207 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "trial_of_the_crusader.h" #include "Group.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "trial_of_the_crusader.h" #define CLEANUP_CHECK_INTERVAL 5000 std::map validDedicatedInsanityItems; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 78aa35c83..8df2d9044 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "trial_of_the_crusader.h" -#include "Player.h" enum MenuTexts { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 7aeb3856e..30bbcb270 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "drak_tharon_keep.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellScript.h" enum Spells diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 5f692db0c..5b1792213 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "drak_tharon_keep.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 5c07e38a4..3f8ed30e1 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "drak_tharon_keep.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 75ed32875..a886119f7 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "drak_tharon_keep.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellAuras.h" enum Yells diff --git a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h index a16bbcdc8..2369286a1 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h +++ b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h @@ -5,8 +5,8 @@ #ifndef DEF_DRAK_THARON_H #define DEF_DRAK_THARON_H -#include "SpellScript.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" enum Data { diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index a6801f5ef..ec936685a 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "drak_tharon_keep.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index c09779dfd..f9f426f1e 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -2,12 +2,12 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "forge_of_souls.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" #include "PassiveAI.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum Yells { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 1cdb43106..dcb409a98 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -2,13 +2,13 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "forge_of_souls.h" -#include "Spell.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Spell.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum eTexts { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index 0671a6d8f..5ab62dea9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -2,12 +2,12 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "forge_of_souls.h" -#include "SpellScript.h" -#include "ScriptedGossip.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum Yells { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 2cbdcd444..f82dc2388 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -2,10 +2,10 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "forge_of_souls.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" class instance_forge_of_souls : public InstanceMapScript { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index 0263ab2ea..085896fac 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -5,14 +5,14 @@ #ifndef DEF_HALLS_OF_REFLECTION_H #define DEF_HALLS_OF_REFLECTION_H -#include "Player.h" -#include "SpellAuras.h" -#include "SpellAuraEffects.h" -#include "ScriptedCreature.h" #include "PassiveAI.h" +#include "Player.h" +#include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "SpellScript.h" #include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellScript.h" enum Data { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 8c1731902..338204127 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -3,8 +3,8 @@ */ #include "halls_of_reflection.h" -#include "Transport.h" #include "MapManager.h" +#include "Transport.h" class UtherBatteredHiltEvent : public BasicEvent { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index 11a22887e..62d005d4d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -2,15 +2,15 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "pit_of_saron.h" -#include "SpellScript.h" -#include "SpellAuras.h" -#include "Player.h" -#include "WorldSession.h" -#include "Opcodes.h" #include "CreatureGroups.h" +#include "Opcodes.h" +#include "pit_of_saron.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" +#include "SpellScript.h" +#include "WorldSession.h" enum Yells { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index dbd06a438..a3cd0e16f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -2,16 +2,16 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "pit_of_saron.h" -#include "Vehicle.h" -#include "SpellScript.h" -#include "PassiveAI.h" -#include "SpellAuraEffects.h" -#include "Player.h" -#include "WorldSession.h" #include "Opcodes.h" +#include "PassiveAI.h" +#include "pit_of_saron.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" +#include "Vehicle.h" +#include "WorldSession.h" enum Yells { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 9c2131bf0..a7b2c83f4 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -2,9 +2,9 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "pit_of_saron.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "Vehicle.h" enum Texts diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 9fb4cf4bd..774969212 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -2,10 +2,10 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "pit_of_saron.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" class instance_pit_of_saron : public InstanceMapScript { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index d4fc72f0b..bb4582a6c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -2,16 +2,16 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SmartAI.h" -#include "pit_of_saron.h" -#include "PassiveAI.h" -#include "SpellAuraEffects.h" -#include "SpellScript.h" -#include "Player.h" #include "CreatureGroups.h" #include "MapManager.h" +#include "PassiveAI.h" +#include "pit_of_saron.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SmartAI.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" class npc_pos_leader : public CreatureScript { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h index 3e1549b4a..20a4f5728 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h @@ -6,6 +6,7 @@ #define DEF_PIT_OF_SARON_H #include "Chat.h" +#include "CreatureAIImpl.h" enum DataTypes { diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 9eea54055..206a4dd5e 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "gundrak.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index d1a1d8930..324248920 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "gundrak.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index e21d769ed..9cd1286ef 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "gundrak.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 359029374..35a27f286 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "gundrak.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum eSpells { diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 86ef8fdc3..14dba37ae 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "gundrak.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 6f3c27346..035f299df 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "gundrak.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index b7cedacfe..e18d1b2d3 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -2,12 +2,12 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellAuraEffects.h" #include "icecrown_citadel.h" +#include "ObjectMgr.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" enum Texts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index d363d7b1a..35d9ac249 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -2,13 +2,13 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "Spell.h" -#include "SpellAuraEffects.h" #include "GridNotifiers.h" #include "icecrown_citadel.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Spell.h" +#include "SpellAuraEffects.h" enum Texts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 64dfd12ba..254de2043 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -2,13 +2,13 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ +#include "icecrown_citadel.h" #include "ObjectMgr.h" -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellAuras.h" -#include "icecrown_citadel.h" -#include "Player.h" enum ScriptTexts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 89639fc8c..450027e59 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellAuras.h" #include "icecrown_citadel.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" enum ScriptTexts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 5ef600ba0..2b4be7884 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -3,14 +3,14 @@ */ #include "CreatureTextMgr.h" +#include "icecrown_citadel.h" #include "MoveSpline.h" #include "MoveSplineInit.h" -#include "SpellScript.h" #include "ScriptMgr.h" +#include "SpellScript.h" #include "Transport.h" #include "TransportMgr.h" #include "Vehicle.h" -#include "icecrown_citadel.h" enum Texts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index dae23c0a8..46c20d59d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -2,13 +2,13 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "Group.h" #include "icecrown_citadel.h" -#include "SpellInfo.h" +#include "ObjectMgr.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellInfo.h" #include enum ScriptTexts diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 08d35f48a..5f7216539 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -2,14 +2,14 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellAuras.h" -#include "MapManager.h" #include "icecrown_citadel.h" +#include "MapManager.h" +#include "ObjectMgr.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" #include "Vehicle.h" #include diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 726b3fc6b..db0575e0f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -2,15 +2,15 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellAuraEffects.h" -#include "Group.h" -#include "Spell.h" -#include "icecrown_citadel.h" -#include "Vehicle.h" #include "GridNotifiers.h" +#include "Group.h" +#include "icecrown_citadel.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Spell.h" +#include "SpellAuraEffects.h" +#include "Vehicle.h" enum ScriptTexts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 7206259f1..4b400acba 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -2,12 +2,12 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellAuras.h" #include "GridNotifiers.h" #include "icecrown_citadel.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" enum Texts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index b8de30481..331af5e89 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -2,12 +2,12 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "GridNotifiers.h" #include "icecrown_citadel.h" +#include "ObjectMgr.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Texts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 1cda63652..eec1bf272 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -2,20 +2,20 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" -#include "Spell.h" -#include "Vehicle.h" -#include "Unit.h" #include "Cell.h" #include "CellImpl.h" +#include "CreatureTextMgr.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "CreatureTextMgr.h" #include "icecrown_citadel.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Spell.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" +#include "Unit.h" +#include "Vehicle.h" enum Texts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index a32e01b6a..b867066ba 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -2,15 +2,15 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellAuraEffects.h" #include "Cell.h" #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "icecrown_citadel.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" enum Texts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 0c2c7cc3f..d406f9729 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -3,19 +3,19 @@ */ #include "AccountMgr.h" -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedEscortAI.h" -#include "PassiveAI.h" #include "Cell.h" #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "SpellAuraEffects.h" -#include "SmartAI.h" #include "Group.h" #include "icecrown_citadel.h" +#include "ObjectMgr.h" +#include "PassiveAI.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptMgr.h" +#include "SmartAI.h" +#include "SpellAuraEffects.h" enum Texts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 7f3027e27..cd8737271 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -5,18 +5,19 @@ #ifndef ICECROWN_CITADEL_H_ #define ICECROWN_CITADEL_H_ -#include "Player.h" #include "Chat.h" -#include "SpellAuras.h" -#include "SpellScript.h" -#include "Map.h" #include "Creature.h" -#include "SpellMgr.h" -#include "PassiveAI.h" -#include "SpellAuraEffects.h" #include "InstanceScript.h" -#include "ScriptedGossip.h" +#include "Map.h" +#include "PassiveAI.h" +#include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellMgr.h" +#include "SpellScript.h" #define ICCScriptName "instance_icecrown_citadel" diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp index 9a9e343da..1e484520b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp @@ -2,12 +2,12 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ +#include "icecrown_citadel.h" +#include "InstanceScript.h" +#include "Player.h" #include "ScriptedGossip.h" #include "ScriptMgr.h" -#include "InstanceScript.h" -#include "icecrown_citadel.h" #include "Spell.h" -#include "Player.h" #define GOSSIP_SENDER_ICC_PORT 631 diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 700446b06..3f2e762cb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -2,19 +2,19 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "InstanceScript.h" -#include "ScriptedCreature.h" -#include "Map.h" #include "AccountMgr.h" +#include "CreatureTextMgr.h" +#include "Group.h" #include "icecrown_citadel.h" +#include "InstanceScript.h" +#include "Map.h" +#include "ObjectMgr.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Transport.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Transport.h" -#include "Group.h" -#include "CreatureTextMgr.h" enum EventIds { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index d26d1bbee..9b640f8ff 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index b3099bd64..b1ca7971b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum Yells diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index ffafaa604..04a4d7ced 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -2,12 +2,12 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" #include "naxxramas.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum Spells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index ce0e3c42a..17cc0f7a2 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" -#include "SpellScript.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum Spells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 1e21e228f..0123c5384 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -2,12 +2,12 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" -#include "GridNotifiers.h" #include "CombatAI.h" +#include "GridNotifiers.h" #include "naxxramas.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum Yells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 5e4b3bffa..f2019657e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" #include "PassiveAI.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellScript.h" enum Spells diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index cffdf1c89..c3cf62808 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 882913483..6871bddf8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" -#include "SpellScript.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum Yells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index cf89cae85..a183557db 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index be2f6a48b..0065b93f5 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" #include "PassiveAI.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 2cd40cdd5..781e69b32 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 2fb33782b..08116a653 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 18d57bb5d..472a66420 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 792984987..0df8add10 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" -#include "SpellScript.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum Yells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index bdfed789d..a27330d92 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "naxxramas.h" -#include "SpellScript.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum Says { diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index c2dfc5f92..8f2b57e31 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -2,13 +2,13 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "naxxramas.h" +#include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "CellImpl.h" +#include "naxxramas.h" #include "PassiveAI.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" const float HeiganPos[2] = {2796, -3707}; const float HeiganEruptionSlope[3] = diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index f59d8d3e7..8ba6fdefd 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -2,18 +2,18 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" +#include "CombatAI.h" #include "eye_of_eternity.h" -#include "Vehicle.h" #include "MoveSpline.h" #include "MoveSplineInit.h" -#include "SpellScript.h" -#include "PassiveAI.h" -#include "CombatAI.h" -#include "Player.h" -#include "WorldSession.h" #include "Opcodes.h" +#include "PassiveAI.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" +#include "Vehicle.h" +#include "WorldSession.h" enum MovementInformPoints { diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h index 5d9277f80..563a065e3 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h @@ -6,6 +6,7 @@ #define DEF_EYE_OF_ETERNITY_H #include "Chat.h" +#include "CreatureAIImpl.h" enum Objects { diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index 98d59db59..15bf32c71 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "eye_of_eternity.h" -#include "Vehicle.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Vehicle.h" bool EoEDrakeEnterVehicleEvent::Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 2dbd0aafa..04f3bc690 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "nexus.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum Spells diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp index b789c384d..a9f8b2b7c 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "nexus.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 1b0d967b2..80bb73e04 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -3,9 +3,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "nexus.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum eEnums { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 2504733bd..ba8b8565a 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "nexus.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 4c780ce74..3a4c5ee4d 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "nexus.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum eEnums { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index c585b29b9..001add23d 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "nexus.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h index d5b457dc3..9deab037a 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h +++ b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h @@ -5,12 +5,12 @@ #ifndef DEF_NEXUS_H #define DEF_NEXUS_H -#include "Player.h" -#include "SpellScript.h" -#include "PassiveAI.h" -#include "SpellAuras.h" -#include "GridNotifiers.h" #include "GameEventMgr.h" +#include "GridNotifiers.h" +#include "PassiveAI.h" +#include "Player.h" +#include "SpellAuras.h" +#include "SpellScript.h" enum eTypes { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 8d5233e5f..5f8d9a903 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -2,9 +2,9 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "oculus.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 603aa029d..b53855c9f 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -2,9 +2,9 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "oculus.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 157cb0688..0bc9a3b5a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -2,9 +2,9 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "oculus.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum Spells diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index d824f67e7..93d28b025 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -2,9 +2,9 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "oculus.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 8a614c562..7723d0bf8 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -2,12 +2,12 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "oculus.h" -#include "LFGMgr.h" #include "Group.h" +#include "LFGMgr.h" +#include "oculus.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" class instance_oculus : public InstanceMapScript { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index c41e29e2f..eb65aedc3 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -2,19 +2,19 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "CombatAI.h" #include "InstanceScript.h" #include "MotionMaster.h" #include "ObjectAccessor.h" +#include "oculus.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "oculus.h" -#include "Vehicle.h" -#include "CombatAI.h" -#include "Player.h" -#include "SpellInfo.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellInfo.h" #include "SpellScript.h" +#include "Vehicle.h" #include enum Drakes diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h index 8396b2cb7..06f2bdedc 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h @@ -5,9 +5,9 @@ #ifndef DEF_OCULUS_H #define DEF_OCULUS_H -#include "SpellScript.h" -#include "SpellAuras.h" #include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellScript.h" Position const VerdisaPOS = { 949.056f, 1032.97f, 359.967f, 1.035795f }; Position const BelgaristraszPOS = { 941.355f, 1044.26f, 359.967f, 0.222459f }; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 3fcd23297..b81aaf92f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "halls_of_lightning.h" +#include "ScriptedCreature.h" #include "ScriptedEscortAI.h" +#include "ScriptMgr.h" enum BjarngrimSpells { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index f10c9fc25..4020af902 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "halls_of_lightning.h" -#include "SpellInfo.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellInfo.h" enum IonarSpells { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index d7985b248..e0cc56559 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" #include "halls_of_lightning.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum LokenSpells { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 623a8344f..6931b1cd7 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "halls_of_lightning.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum VolkahnSpells diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 853596139..548b2277d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "halls_of_lightning.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" class instance_halls_of_lightning : public InstanceMapScript { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 6cbc6c5ff..12d722b61 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -1,11 +1,11 @@ /* Xinef */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" #include "halls_of_stone.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum spells { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 34b8a8a56..995252211 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -1,8 +1,9 @@ /* MAIDEN OF GRIEF BY SILVANII (mmorcin@wp.pl), Some cleanups by Xinef */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "halls_of_stone.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" + enum spells { PARTING_SORROW = 59723, diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 5329c267a..be76d5b7b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "halls_of_stone.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp index ce78920d0..b89af0c19 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp @@ -2,13 +2,13 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "halls_of_stone.h" -#include "ScriptedEscortAI.h" -#include "SpellScript.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SpellScript.h" #define GOSSIP_ITEM_1 "Brann, it would be our honor!" #define GOSSIP_ITEM_2 "Let's move Brann, enough of the history lessons!" diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index bd8e4b72d..5f9f2679b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "halls_of_stone.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" class instance_halls_of_stone : public InstanceMapScript { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 6ae3b6660..bdefc931e 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -2,16 +2,16 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" -#include "PassiveAI.h" #include "GameObjectAI.h" #include "MapManager.h" #include "MoveSplineInit.h" -#include "ulduar.h" +#include "ObjectMgr.h" +#include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" +#include "ulduar.h" enum Spells { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index bb6dc63f4..f1a1132c5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -2,12 +2,12 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" #include "SpellScript.h" #include "ulduar.h" -#include "SpellAuraEffects.h" -#include "Player.h" enum AssemblySpells { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index 96543b649..378e9c352 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -2,12 +2,12 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" #include "SpellScript.h" #include "ulduar.h" -#include "SpellAuraEffects.h" -#include "Player.h" enum AuriayaSpells { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 07388f3ad..7e992a592 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -2,21 +2,21 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "CombatAI.h" +#include "GridNotifiers.h" +#include "Opcodes.h" +#include "PassiveAI.h" +#include "Player.h" #include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "Spell.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" #include "SpellScript.h" #include "ulduar.h" #include "Vehicle.h" -#include "ScriptedEscortAI.h" -#include "SpellAuras.h" -#include "PassiveAI.h" -#include "SpellAuraEffects.h" -#include "ScriptedGossip.h" -#include "CombatAI.h" -#include "Spell.h" -#include "GridNotifiers.h" -#include "Player.h" -#include "Opcodes.h" enum LeviathanSpells { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 4c4f35d94..2c7f14f40 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -2,12 +2,12 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ulduar.h" -#include "SpellAuras.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" +#include "ulduar.h" enum FreyaSpells { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index d8bcf5495..06aa9fb5f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -2,15 +2,15 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" -#include "ulduar.h" #include "AccountMgr.h" +#include "BanManager.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" +#include "ulduar.h" #include "WorldSession.h" -#include "BanManager.h" enum VezaxSpellData { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 65aff47fe..89cf09be3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -2,14 +2,14 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" -#include "ulduar.h" -#include "SpellAuraEffects.h" -#include "SpellAuras.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellScript.h" +#include "ulduar.h" enum HodirSpellData { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 753414b58..7245d6e2a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -2,14 +2,14 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" #include "SpellScript.h" #include "ulduar.h" #include "Vehicle.h" -#include "SpellAuras.h" -#include "SpellAuraEffects.h" -#include "Player.h" #define SPELL_FLAME_JETS_10 62680 #define SPELL_FLAME_JETS_25 63472 diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 302f49327..940f533b7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -2,14 +2,14 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "PassiveAI.h" +#include "Player.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" #include "SpellScript.h" #include "ulduar.h" #include "Vehicle.h" -#include "SpellAuraEffects.h" -#include "PassiveAI.h" -#include "Player.h" enum KologarnSays { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 8f16064df..4a5f07649 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -2,16 +2,16 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "MapManager.h" +#include "PassiveAI.h" +#include "Player.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Spell.h" +#include "SpellAuraEffects.h" #include "SpellScript.h" #include "ulduar.h" #include "Vehicle.h" -#include "Spell.h" -#include "MapManager.h" -#include "SpellAuraEffects.h" -#include "PassiveAI.h" -#include "Player.h" enum SpellData { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index e2abb39bd..9d915f92c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -2,16 +2,16 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "SpellScript.h" -#include "ulduar.h" -#include "SpellAuras.h" +#include "MoveSplineInit.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" +#include "SpellScript.h" +#include "ulduar.h" #include "WaypointManager.h" -#include "MoveSplineInit.h" #define SPELL_FLAMEBUFFET_10 64016 #define SPELL_FLAMEBUFFET_25 64023 diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 1255958d8..aae02178c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -2,14 +2,14 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" -#include "ulduar.h" -#include "ScriptedEscortAI.h" -#include "SpellAuraEffects.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" +#include "ulduar.h" enum ThorimSpells { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 2b14689df..1a1821254 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -2,15 +2,15 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "Opcodes.h" +#include "PassiveAI.h" +#include "Player.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" #include "SpellScript.h" #include "ulduar.h" #include "Vehicle.h" -#include "PassiveAI.h" -#include "SpellAuraEffects.h" -#include "Player.h" -#include "Opcodes.h" enum XT002Spells { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp index f235e4747..0e906d373 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp @@ -2,17 +2,17 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" -#include "ulduar.h" -#include "ScriptedEscortAI.h" -#include "SpellAuras.h" -#include "PassiveAI.h" -#include "Opcodes.h" -#include "Player.h" #include "CreatureAI.h" #include "Object.h" +#include "Opcodes.h" +#include "PassiveAI.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" +#include "SpellScript.h" +#include "ulduar.h" enum YoggSpells { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index b21dba77b..9ebe5a3db 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -2,14 +2,14 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Transport.h" #include "ulduar.h" #include "Vehicle.h" -#include "Player.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Transport.h" class instance_ulduar : public InstanceMapScript { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp index 0322edcf5..fe55617a4 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp @@ -2,13 +2,13 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ulduar.h" -#include "SpellScript.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" -#include "Player.h" +#include "SpellScript.h" +#include "ulduar.h" class npc_ulduar_keeper : public CreatureScript { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index 34abe9b5b..cf32bc895 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -5,10 +5,10 @@ #ifndef DEF_ULDUAR_H #define DEF_ULDUAR_H +#include "CellImpl.h" #include "Chat.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "CellImpl.h" enum UlduarEncounters { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 5d8e0ea8a..e88a9c34d 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -2,8 +2,8 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "utgarde_keep.h" enum eDisplayId diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 8f212a8ce..030735664 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -2,12 +2,12 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "PassiveAI.h" #include "ScriptedCreature.h" -#include "utgarde_keep.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" -#include "PassiveAI.h" +#include "utgarde_keep.h" enum eTexts { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 2a556ea24..8c52ee7a4 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -2,8 +2,8 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "utgarde_keep.h" enum eTexts diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index d99fa9dfd..cf3d7ccae 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -2,10 +2,10 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "utgarde_keep.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "utgarde_keep.h" class instance_utgarde_keep : public InstanceMapScript { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index ff8653930..0d0156e46 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "GameObjectAI.h" -#include "Vehicle.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "utgarde_keep.h" +#include "Vehicle.h" class npc_dragonflayer_forge_master : public CreatureScript { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 64a7000e8..e43f19b5a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "utgarde_pinnacle.h" enum Misc diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index bc309e31a..10e18ae25 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -2,13 +2,13 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "utgarde_pinnacle.h" -#include "Vehicle.h" #include "CombatAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "utgarde_pinnacle.h" +#include "Vehicle.h" enum Misc { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 779be63d2..fc4eff3cd 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -2,12 +2,12 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "utgarde_pinnacle.h" -#include "SpellScript.h" -#include "Player.h" #include "PassiveAI.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" +#include "utgarde_pinnacle.h" enum Misc { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 7a27d1883..8694b4e62 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "utgarde_pinnacle.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "utgarde_pinnacle.h" enum Misc { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index 0fb741e32..f111fbad3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "utgarde_pinnacle.h" class instance_pinnacle : public InstanceMapScript diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index fcb3d7b56..f8df7f3e2 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "vault_of_archavon.h" +#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" +#include "vault_of_archavon.h" enum Archavon { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index a31a0585b..b1978e877 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "vault_of_archavon.h" +#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" +#include "vault_of_archavon.h" enum Spells { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index f68658b0e..e67cc1818 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "vault_of_archavon.h" +#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" +#include "vault_of_archavon.h" enum Events { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 8a32380f4..75f3c0cf0 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -2,12 +2,12 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "vault_of_archavon.h" -#include "SpellAuras.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" +#include "vault_of_archavon.h" enum Spells { diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp index b7bdd63a8..4ae8921ad 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -4,13 +4,13 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "vault_of_archavon.h" #include "Battlefield.h" #include "BattlefieldMgr.h" -#include "SpellAuras.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" +#include "vault_of_archavon.h" /* Vault of Archavon encounters: 1 - Archavon the Stone Watcher event diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index b974ad6aa..e8a237fcd 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -2,10 +2,10 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "violet_hold.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "violet_hold.h" enum Yells { diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 5cafc0cad..1ce050494 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -2,8 +2,8 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "violet_hold.h" enum eSpells diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 2b2a2a756..b5b0331a7 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "violet_hold.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "violet_hold.h" #define ACTION_WATER_ELEMENT_HIT 1 #define ACTION_WATER_ELEMENT_KILLED 2 diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 24a4a72ec..766ab3203 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -2,8 +2,8 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "violet_hold.h" enum eSpells diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 8bbf2c4a2..c38d48881 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -2,11 +2,11 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "violet_hold.h" -#include "SpellScript.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" +#include "violet_hold.h" enum eSpells { diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 8ec6b8c21..17176fd68 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -2,8 +2,8 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "violet_hold.h" enum Yells diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 793e5979c..43d732f1f 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -2,10 +2,10 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "violet_hold.h" #include "PassiveAI.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "violet_hold.h" enum Yells { diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 6f3fde5d2..5a11cdcc4 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -2,10 +2,10 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "violet_hold.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "violet_hold.h" #define CLEANUP_CHECK_INTERVAL 5000 #define SPAWN_TIME 20000 diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 5fd6f772e..a0040aa42 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -2,14 +2,14 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "violet_hold.h" #include "PassiveAI.h" -#include "SpellScript.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SpellScript.h" +#include "violet_hold.h" /*********** ** DEFENSE SYSTEM CRYSTAL diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index 2ac9ef6e4..7acb4d9ab 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -4,14 +4,14 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "BattlegroundIC.h" -#include "SpellScript.h" #include "CombatAI.h" #include "PassiveAI.h" -#include "SpellAuras.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" +#include "SpellScript.h" enum eIoCTurrent { diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index c97823394..a9a42bcab 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -22,17 +22,17 @@ npc_lurgglbr npc_nexus_drake_hatchling EndContentData */ -#include "ScriptMgr.h" +#include "PassiveAI.h" +#include "Player.h" #include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "ScriptedEscortAI.h" #include "ScriptedFollowerAI.h" -#include "Player.h" -#include "SpellInfo.h" -#include "WorldSession.h" -#include "SpellScript.h" -#include "PassiveAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellAuras.h" +#include "SpellInfo.h" +#include "SpellScript.h" +#include "WorldSession.h" // Ours enum eDrakeHunt diff --git a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp index 32349959a..a55a2c3fd 100644 --- a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp @@ -12,13 +12,13 @@ SDComment: SDCategory: CrystalsongForest Script Data End */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" +#include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SmartScriptMgr.h" #include "Transport.h" #include "Vehicle.h" -#include "PassiveAI.h" enum ePreparationsForWar { diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 7085b6b5c..cfdf2b800 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -12,13 +12,13 @@ SDComment: For what is 63990+63991? Same function but don't work correct... SDCategory: Dalaran Script Data End */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "Player.h" -#include "WorldSession.h" +#include "ScriptedCreature.h" #include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "World.h" +#include "WorldSession.h" // Ours class npc_steam_powered_auctioneer : public CreatureScript diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 3647539e6..1d6125b46 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -14,19 +14,19 @@ EndScriptData */ /* ContentData EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "SpellScript.h" -#include "Player.h" -#include "Vehicle.h" +#include "CellImpl.h" +#include "Chat.h" +#include "CombatAI.h" #include "CreatureTextMgr.h" #include "PassiveAI.h" -#include "CombatAI.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellAuras.h" -#include "Chat.h" -#include "CellImpl.h" +#include "SpellScript.h" +#include "Vehicle.h" // Ours /******** diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 3d383ce1d..a9fb7f54c 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -4,16 +4,16 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" +#include "CombatAI.h" +#include "CreatureTextMgr.h" +#include "Pet.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "Vehicle.h" -#include "CombatAI.h" -#include "Player.h" -#include "Pet.h" +#include "ScriptMgr.h" #include "SpellInfo.h" -#include "CreatureTextMgr.h" #include "SpellScript.h" +#include "Vehicle.h" // Ours enum qRedRocket diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 2d93dc1ba..2e2347f07 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -16,12 +16,12 @@ npc_plaguehound_tracker npc_apothecary_hanes EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellInfo.h" // Ours diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index e0b739e61..236b2dd3a 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -15,18 +15,18 @@ EndScriptData */ npc_arete EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "SpellAuras.h" -#include "Player.h" #include "CombatAI.h" #include "MoveSplineInit.h" -#include "ScriptedEscortAI.h" -#include "Vehicle.h" -#include "SmartScriptMgr.h" -#include "SpellScript.h" #include "PassiveAI.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SmartScriptMgr.h" +#include "SpellAuras.h" +#include "SpellScript.h" +#include "Vehicle.h" // Ours enum eBKG diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index b04a99558..1e32b4cfd 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -17,18 +17,18 @@ npc_vekjik avatar_of_freya EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "SpellScript.h" -#include "SpellAuras.h" + +#include "CombatAI.h" +#include "PassiveAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" +#include "SpellScript.h" #include "Vehicle.h" #include "WaypointManager.h" -#include "PassiveAI.h" -#include "CombatAI.h" - // Ours enum songOfWindandWater { diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 5152eff1c..dd3e8aba2 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -4,17 +4,17 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" -#include "Vehicle.h" #include "CombatAI.h" #include "Player.h" -#include "WorldSession.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" +#include "Vehicle.h" #include "WaypointManager.h" +#include "WorldSession.h" // Ours enum qSniffing diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 72dc90c4c..d35310999 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -13,23 +13,23 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" +#include "Battlefield.h" #include "BattlefieldMgr.h" #include "BattlefieldWG.h" -#include "Battlefield.h" -#include "ScriptSystem.h" -#include "WorldSession.h" -#include "ObjectMgr.h" -#include "Vehicle.h" -#include "GameObjectAI.h" -#include "SpellScript.h" -#include "ScriptedGossip.h" #include "CombatAI.h" +#include "GameGraveyard.h" +#include "GameObjectAI.h" +#include "ObjectMgr.h" #include "Player.h" #include "PoolMgr.h" -#include "GameGraveyard.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "ScriptSystem.h" +#include "SpellScript.h" +#include "Vehicle.h" #include "World.h" +#include "WorldSession.h" #define GOSSIP_HELLO_DEMO1 "Build catapult." #define GOSSIP_HELLO_DEMO2 "Build demolisher." diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 28fb3bba7..54b31bd85 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -4,16 +4,16 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "Player.h" #include "CombatAI.h" #include "PassiveAI.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" #include "SpellInfo.h" #include "Vehicle.h" -#include "SpellAuras.h" // Ours enum AlchemistItemRequirements diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 89a732250..0d3131ce2 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -4,19 +4,19 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "OutdoorPvPEP.h" -#include "WorldPacket.h" -#include "Player.h" -#include "GameObject.h" -#include "ObjectMgr.h" -#include "ObjectAccessor.h" -#include "OutdoorPvPMgr.h" #include "Creature.h" -#include "Language.h" -#include "World.h" -#include "GossipDef.h" #include "GameGraveyard.h" +#include "GameObject.h" +#include "GossipDef.h" +#include "Language.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "OutdoorPvPEP.h" +#include "OutdoorPvPMgr.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "World.h" +#include "WorldPacket.h" OPvPCapturePointEP_EWT::OPvPCapturePointEP_EWT(OutdoorPvP* pvp) : OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_UnitsSummonedSideId(TEAM_NEUTRAL) diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp index 2081b4738..c13f0b828 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp @@ -4,15 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "OutdoorPvPGH.h" -#include "Player.h" -#include "ObjectMgr.h" -#include "OutdoorPvPMgr.h" -#include "WorldPacket.h" -#include "Language.h" -#include "World.h" #include "GameEventMgr.h" +#include "Language.h" +#include "ObjectMgr.h" +#include "OutdoorPvPGH.h" +#include "OutdoorPvPMgr.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "World.h" +#include "WorldPacket.h" OutdoorPvPGH::OutdoorPvPGH() { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index ee2f174e4..788c327bb 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -4,15 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "OutdoorPvPHP.h" +#include "Language.h" +#include "ObjectMgr.h" #include "OutdoorPvP.h" +#include "OutdoorPvPHP.h" #include "OutdoorPvPMgr.h" #include "Player.h" -#include "WorldPacket.h" +#include "ScriptMgr.h" #include "World.h" -#include "ObjectMgr.h" -#include "Language.h" +#include "WorldPacket.h" const uint32 HP_LANG_LOSE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_LOSE_BROKENHILL_A, LANG_OPVP_HP_LOSE_OVERLOOK_A, LANG_OPVP_HP_LOSE_STADIUM_A}; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index a98dc0a51..d511dfa94 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -4,15 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "OutdoorPvPNA.h" -#include "Player.h" +#include "GameGraveyard.h" +#include "Language.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" -#include "WorldPacket.h" -#include "Language.h" +#include "OutdoorPvPNA.h" +#include "Player.h" +#include "ScriptMgr.h" #include "World.h" -#include "GameGraveyard.h" +#include "WorldPacket.h" OutdoorPvPNA::OutdoorPvPNA() { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index 64749e7d7..76df863c0 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -4,18 +4,18 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "OutdoorPvPSI.h" -#include "WorldPacket.h" -#include "Player.h" #include "GameObject.h" +#include "Language.h" #include "MapManager.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" +#include "OutdoorPvPSI.h" +#include "Player.h" #include "ReputationMgr.h" -#include "Language.h" -#include "World.h" +#include "ScriptMgr.h" #include "Transport.h" +#include "World.h" +#include "WorldPacket.h" OutdoorPvPSI::OutdoorPvPSI() { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index 002ecca8f..1d371e52b 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -4,15 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "OutdoorPvPTF.h" -#include "OutdoorPvPMgr.h" -#include "OutdoorPvP.h" -#include "WorldPacket.h" -#include "Player.h" -#include "ObjectMgr.h" #include "Language.h" +#include "ObjectMgr.h" +#include "OutdoorPvP.h" +#include "OutdoorPvPMgr.h" +#include "OutdoorPvPTF.h" +#include "Player.h" +#include "ScriptMgr.h" #include "World.h" +#include "WorldPacket.h" OutdoorPvPTF::OutdoorPvPTF() { diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 0a719d5c6..399603842 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -4,17 +4,17 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "OutdoorPvPZM.h" +#include "Creature.h" +#include "GameGraveyard.h" +#include "GossipDef.h" +#include "ObjectAccessor.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" +#include "OutdoorPvPZM.h" #include "Player.h" -#include "Creature.h" -#include "ObjectAccessor.h" -#include "WorldPacket.h" -#include "GossipDef.h" +#include "ScriptMgr.h" #include "World.h" -#include "GameGraveyard.h" +#include "WorldPacket.h" OPvPCapturePointZM_Beacon::OPvPCapturePointZM_Beacon(OutdoorPvP* pvp, ZM_BeaconType type) : OPvPCapturePoint(pvp), m_TowerType(type), m_TowerState(ZM_TOWERSTATE_N) diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index 57b6db205..1270c80d0 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum ExarchMaladaar { diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 3366eab40..c31f94c8f 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "Player.h" -#include "SpellScript.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellAuras.h" +#include "SpellScript.h" enum eShirrak { diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp index 19e37b63e..831c09723 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/instance_auchenai_crypts.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "ScriptMgr.h" #include "auchenai_crypts.h" #include "InstanceScript.h" #include "Map.h" +#include "ScriptMgr.h" class instance_auchenai_crypts : public InstanceMapScript { diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index d42fecada..a4c21a0bd 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Texts { diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp index 168f9c91d..ea8db4dd2 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "ScriptMgr.h" #include "InstanceScript.h" #include "mana_tombs.h" #include "Map.h" +#include "ScriptMgr.h" class instance_mana_tombs : public InstanceMapScript { diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp index e83e6bf06..995b5cf0f 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "sethekk_halls.h" enum TailonkingIkiss diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 322cd5297..bb32834cd 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" +#include "ScriptMgr.h" #include "sethekk_halls.h" class instance_sethekk_halls : public InstanceMapScript diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index a37de398b..05a350e11 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" +#include "ScriptMgr.h" #include "shadow_labyrinth.h" enum eEnums diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index dbb03eafe..e57f23fae 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "shadow_labyrinth.h" enum BlackheartTheInciter diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index 3522ca11c..ffc9ea426 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "shadow_labyrinth.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "shadow_labyrinth.h" enum GrandmasterVorpil { diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 5c6ebdd5e..7a58f8de9 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "shadow_labyrinth.h" #include "SpellInfo.h" diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index da3173cf7..5c73d3396 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" +#include "ScriptMgr.h" #include "shadow_labyrinth.h" class instance_shadow_labyrinth : public InstanceMapScript diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h index cb693505e..e54d53d41 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h @@ -5,9 +5,9 @@ #ifndef DEF_SHADOW_LABYRINTH_H #define DEF_SHADOW_LABYRINTH_H -#include "SpellScript.h" #include "CreatureAI.h" #include "GridNotifiers.h" +#include "SpellScript.h" enum slData { diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h index 684a59f68..bb883091d 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.h +++ b/src/server/scripts/Outland/BlackTemple/black_temple.h @@ -5,12 +5,12 @@ #ifndef BLACK_TEMPLE_H_ #define BLACK_TEMPLE_H_ +#include "GridNotifiers.h" +#include "PassiveAI.h" #include "Player.h" #include "ScriptedGossip.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" -#include "PassiveAI.h" -#include "GridNotifiers.h" +#include "SpellScript.h" enum DataTypes { diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 78ece226a..e67af4e0d 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "black_temple.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index bf0000dc3..74b7d4170 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "black_temple.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "black_temple.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index a246045d2..48674a191 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "black_temple.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 8175afa38..ef8bb71a8 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "black_temple.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "Spell.h" enum Says diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 6ac4cf373..50a5cdcd9 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "black_temple.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index c6e235f35..941ecc030 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "black_temple.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Supremus { diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 81e99aaca..0b71856fa 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "black_temple.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index f2c8511c4..a20e390e1 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "black_temple.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 47a2527d6..266e0ae78 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "black_temple.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index c81dea229..1f9cc267f 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "InstanceScript.h" #include "black_temple.h" +#include "InstanceScript.h" +#include "ScriptMgr.h" DoorData const doorData[] = { 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 ea71fe650..9affaf4b7 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "serpent_shrine.h" enum Talk diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 00e387892..020c077c7 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "serpent_shrine.h" enum Talk diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 4c54b757a..d4ef2b016 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "serpent_shrine.h" #include "Spell.h" -#include "Player.h" #include "WorldSession.h" enum Says 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 9a98053af..4fccf5095 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 @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "serpent_shrine.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "serpent_shrine.h" enum Talk { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 3a75a7f5b..ef756fffc 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "serpent_shrine.h" enum Spells diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 93981663f..1eb4763a5 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "serpent_shrine.h" enum Yells diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 73d2bb72f..0e9adc022 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" -#include "serpent_shrine.h" #include "Player.h" +#include "ScriptMgr.h" +#include "serpent_shrine.h" #include "TemporarySummon.h" DoorData const doorData[] = diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h index 1dfb8aaf6..cfed80a44 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h @@ -5,11 +5,11 @@ #ifndef DEF_SERPENT_SHRINE_H #define DEF_SERPENT_SHRINE_H -#include "Player.h" -#include "SpellScript.h" #include "CreatureAI.h" -#include "SpellAuraEffects.h" #include "GridNotifiers.h" +#include "Player.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum DataTypes { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp index 18cfb98b9..fd7981852 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp @@ -2,13 +2,13 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "PassiveAI.h" -#include "Player.h" #include "Group.h" #include "LFGMgr.h" +#include "PassiveAI.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #define GOSSIP_TEXT_ID 15864 #define QUEST_SUMMON_AHUNE 11691 diff --git a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp index fbf4b6c87..547788c1a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp @@ -22,10 +22,10 @@ Without it, the party doing random dungeon won't get satchel of spoils and gets instead the deserter debuff. */ -#include "ScriptMgr.h" #include "Creature.h" #include "InstanceScript.h" #include "Map.h" +#include "ScriptMgr.h" #include "the_slave_pens.h" class instance_the_slave_pens : public InstanceMapScript diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 9bf03fe96..2f88e4b55 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "steam_vault.h" enum HydromancerThespia diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index be30c43ca..d6077ee13 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "steam_vault.h" enum MekgineerSteamrigger 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 b87f2c558..6e26e27f8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "steam_vault.h" +#include "ScriptMgr.h" #include "SpellInfo.h" +#include "steam_vault.h" enum NagaDistiller { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 722586b93..7d881da9a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" +#include "ScriptMgr.h" #include "steam_vault.h" class go_main_chambers_access_panel : public GameObjectScript diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index 3f46d5ba4..f932e8488 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -11,8 +11,8 @@ SDComment: Timers may be incorrect SDCategory: Coilfang Resevoir, Underbog EndScriptData */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellScript.h" enum eBlackStalker diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp index e7983372d..b92d95ea8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp @@ -22,9 +22,9 @@ Without it, the party doing random dungeon won't get satchel of spoils and gets instead the deserter debuff. */ -#include "ScriptMgr.h" #include "InstanceScript.h" #include "Map.h" +#include "ScriptMgr.h" #include "the_underbog.h" class instance_the_underbog : public InstanceMapScript diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 7ef3b0d22..25c9bcd5b 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" #include "gruuls_lair.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum Yells { diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index d9c639346..f2115ead8 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "gruuls_lair.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum HighKingMaulgar { diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h index fa664504f..89572057b 100644 --- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h +++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h @@ -5,8 +5,8 @@ #ifndef GRUULS_LAIR_H_ #define GRUULS_LAIR_H_ -#include "SpellAuraEffects.h" #include "CreatureAI.h" +#include "SpellAuraEffects.h" enum DataTypes { diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index 0548cb417..a90850115 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "InstanceScript.h" #include "gruuls_lair.h" +#include "InstanceScript.h" +#include "ScriptMgr.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index f4f81d0ff..959b4b13e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" #include "blood_furnace.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum eEnums { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index fc2850433..1bad8e427 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellAuras.h" #include "blood_furnace.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellAuras.h" enum eKelidan { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index aaee2df5f..f043397ad 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blood_furnace.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum eEnums { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index d20d9cd4d..7493acab5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "InstanceScript.h" #include "blood_furnace.h" #include "CreatureAI.h" +#include "InstanceScript.h" +#include "ScriptMgr.h" class instance_blood_furnace : public InstanceMapScript { diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 01dd5bb26..09137fc09 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "hellfire_ramparts.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index b8588d688..071a6ac41 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "hellfire_ramparts.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index aa246c10a..3cad4f767 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "hellfire_ramparts.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index a5ab022ab..b586766c3 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "InstanceScript.h" #include "hellfire_ramparts.h" +#include "InstanceScript.h" +#include "ScriptMgr.h" class instance_ramparts : public InstanceMapScript { diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index dc83b5ff0..87a19bae1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "magtheridons_lair.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum Yells diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 1747cce31..9c087a9fb 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "InstanceScript.h" #include "magtheridons_lair.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index d9bb3906e..02b7cda2e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "shattered_halls.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "shattered_halls.h" enum eGrandWarlockNethekurse { diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 1c31d25b3..3e0badc14 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "shattered_halls.h" enum Spells diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 67f1a48a4..815200204 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "shattered_halls.h" enum Says diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 8548ec4d4..ca4449a90 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "InstanceScript.h" -#include "shattered_halls.h" #include "CreatureTextMgr.h" +#include "InstanceScript.h" +#include "ScriptMgr.h" +#include "shattered_halls.h" class instance_shattered_halls : public InstanceMapScript { diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h index c9edcface..5bfa6619d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h @@ -5,8 +5,8 @@ #ifndef DEF_SHATTERED_H #define DEF_SHATTERED_H -#include "SpellScript.h" #include "PassiveAI.h" +#include "SpellScript.h" enum DataTypes { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 2d071d695..6c355b189 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "MoveSplineInit.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "the_eye.h" #include "WaypointManager.h" -#include "MoveSplineInit.h" enum Spells { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index e778d11f3..da00842d0 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" +#include "Opcodes.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "the_eye.h" #include "WorldPacket.h" -#include "Opcodes.h" enum Yells { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 304fe9111..a05433913 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "the_eye.h" enum voidReaver diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 757fdd23b..8ca620c98 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" +#include "ScriptMgr.h" #include "the_eye.h" class instance_the_eye : public InstanceMapScript diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h index 35fdedf76..ccfeeabe0 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h @@ -5,10 +5,10 @@ #ifndef DEF_THE_EYE_H #define DEF_THE_EYE_H -#include "SpellScript.h" -#include "SpellAuraEffects.h" -#include "Player.h" #include "GridNotifiers.h" +#include "Player.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum EyeData { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp index 8a2356c0e..875e5c738 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "mechanar.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Say { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 10cc4fccd..516887df4 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "mechanar.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp index 7d40c50c3..695561a31 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp @@ -2,11 +2,11 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" #include "mechanar.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SpellScript.h" enum Spells { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index c3462e59d..e1cd380ce 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "mechanar.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index fc6713086..2dc2373d1 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "mechanar.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index 698e1d443..559a9a82f 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" #include "mechanar.h" +#include "ScriptMgr.h" static DoorData const doorData[] = { diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h index b2b3db475..9ae7db8f4 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h @@ -5,10 +5,10 @@ #ifndef DEF_MECHANAR_H #define DEF_MECHANAR_H -#include "SpellScript.h" -#include "SpellAuraEffects.h" -#include "Player.h" #include "CreatureAI.h" +#include "Player.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum DataTypes { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 41b753182..e9ee61f86 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "arcatraz.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum MillhouseSays { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h index fc3f01ca7..1cba01153 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h @@ -5,9 +5,9 @@ #ifndef ARCATRAZ_H #define ARCATRAZ_H -#include "SpellScript.h" -#include "Player.h" #include "CreatureAI.h" +#include "Player.h" +#include "SpellScript.h" enum DataTypes { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp index d800697ec..19c6cd403 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "arcatraz.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Say { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index ba84f5f27..bca0d05de 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "arcatraz.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Says { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp index 535b84503..3d71d7762 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "arcatraz.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Say { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp index 10701e3a6..1bfec8884 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "arcatraz.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Say { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index 51d29f2db..1fa781ae8 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -2,9 +2,9 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" -#include "InstanceScript.h" #include "arcatraz.h" +#include "InstanceScript.h" +#include "ScriptMgr.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index b27717d57..949e15671 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -2,10 +2,10 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "the_botanica.h" +#include "ScriptMgr.h" #include "SpellScript.h" +#include "the_botanica.h" enum Says { diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index 23b051ccb..a2e30622a 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "the_botanica.h" enum Says diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 71d8822fe..b6c243661 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "the_botanica.h" enum Spells diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index e87e355f0..f6fe6e3ba 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "the_botanica.h" enum Says diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 946f4bf17..4a7682da7 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "the_botanica.h" enum Says diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp index 39bb71665..a06f935ad 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp @@ -2,8 +2,8 @@ * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "ScriptMgr.h" #include "InstanceScript.h" +#include "ScriptMgr.h" #include "the_botanica.h" class instance_the_botanica : public InstanceMapScript diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index c1b51a1c5..9be93be12 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index 4321766d1..6c4610dac 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Texts { diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 1218697de..710341e7e 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -17,17 +17,17 @@ npc_daranelle go_legion_obelisk EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" #include "Cell.h" #include "CellImpl.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellAuras.h" #include "SpellInfo.h" #include "SpellScript.h" -#include "SpellAuras.h" -#include "SpellAuraEffects.h" // Ours enum deathsdoorfell diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index 7ec160804..828d8c3ee 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -18,13 +18,13 @@ npc_wounded_blood_elf npc_fel_guard_hound EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Player.h" -#include "WorldSession.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellScript.h" +#include "WorldSession.h" // Ours diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 2e20f495d..b96f48958 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -15,11 +15,12 @@ EndScriptData */ npc_maghar_captive npc_creditmarker_visit_with_ancestors EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" + #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellInfo.h" /*##### diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 3a48ac8b0..dd93ebc39 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -18,12 +18,12 @@ npc_maxx_a_million go_captain_tyralius_prison EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "Player.h" #include "GameObjectAI.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellInfo.h" /* ################################### diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 922f1f96f..0094ab9b2 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -26,13 +26,13 @@ go_crystal_prison npc_enraged_spirit EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Group.h" -#include "SpellScript.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "SpellScript.h" #include "WorldSession.h" // Ours diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index 33192c598..992b15289 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -20,11 +20,11 @@ npc_kservant npc_ishanah EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "WorldSession.h" /*###### diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index 699740833..8ecd88c8b 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -21,15 +21,15 @@ npc_isla_starmane npc_slim EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "SpellScript.h" #include "Group.h" #include "Player.h" -#include "WorldSession.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SpellAuras.h" +#include "SpellScript.h" +#include "WorldSession.h" // Ours enum fumping diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index be08823bf..37d23913a 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -20,11 +20,11 @@ npc_kayra_longmane npc_timothy_daniels EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "WorldSession.h" // Ours diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp index 7903c31d6..c549b3dfc 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -9,14 +9,14 @@ * Scriptnames of files in this file should be prefixed with "npc_pet_dk_". */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "CombatAI.h" #include "Cell.h" #include "CellImpl.h" +#include "CombatAI.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "PassiveAI.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" enum DeathKnightSpells diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index 401c6262c..b5fcfd730 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -9,16 +9,16 @@ * Scriptnames of files in this file should be prefixed with "npc_pet_gen_". */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "Player.h" -#include "Group.h" #include "CreatureTextMgr.h" -#include "PetAI.h" +#include "Group.h" #include "PassiveAI.h" +#include "PetAI.h" +#include "Player.h" +#include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "SpellScript.h" +#include "ScriptMgr.h" #include "SpellAuras.h" +#include "SpellScript.h" enum Mojo { diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp index eff841cd2..f0e434ee0 100644 --- a/src/server/scripts/Pet/pet_hunter.cpp +++ b/src/server/scripts/Pet/pet_hunter.cpp @@ -9,8 +9,8 @@ * Scriptnames of files in this file should be prefixed with "npc_pet_hun_". */ -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum HunterSpells { diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp index eb3296beb..3a0ac0aee 100644 --- a/src/server/scripts/Pet/pet_mage.cpp +++ b/src/server/scripts/Pet/pet_mage.cpp @@ -9,11 +9,11 @@ * Scriptnames of files in this file should be prefixed with "npc_pet_mag_". */ -#include "Player.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "CombatAI.h" #include "Pet.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellAuras.h" enum MageSpells diff --git a/src/server/scripts/Pet/pet_priest.cpp b/src/server/scripts/Pet/pet_priest.cpp index ed2ace22a..34976cd17 100644 --- a/src/server/scripts/Pet/pet_priest.cpp +++ b/src/server/scripts/Pet/pet_priest.cpp @@ -9,10 +9,10 @@ * Scriptnames of files in this file should be prefixed with "npc_pet_pri_". */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "PassiveAI.h" #include "PetAI.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "TotemAI.h" enum PriestSpells diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp index 8cd97ec0f..0b210b73e 100644 --- a/src/server/scripts/Pet/pet_shaman.cpp +++ b/src/server/scripts/Pet/pet_shaman.cpp @@ -10,8 +10,8 @@ */ #include "Player.h" -#include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum ShamanSpells { diff --git a/src/server/scripts/PrecompiledHeaders/ScriptPCH.h b/src/server/scripts/PrecompiledHeaders/ScriptPCH.h index 110ed7a23..c254b6100 100644 --- a/src/server/scripts/PrecompiledHeaders/ScriptPCH.h +++ b/src/server/scripts/PrecompiledHeaders/ScriptPCH.h @@ -6,25 +6,25 @@ #ifndef SC_PRECOMPILED_H #define SC_PRECOMPILED_H -#include "ScriptMgr.h" #include "Cell.h" #include "CellImpl.h" +#include "Chat.h" +#include "CombatAI.h" +#include "DBCStores.h" +#include "DBCStructure.h" #include "GameEventMgr.h" +#include "GameObject.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "Unit.h" -#include "GameObject.h" +#include "InstanceScript.h" +#include "ObjectMgr.h" +#include "PassiveAI.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "InstanceScript.h" -#include "CombatAI.h" -#include "PassiveAI.h" -#include "Chat.h" -#include "DBCStructure.h" -#include "DBCStores.h" -#include "ObjectMgr.h" -#include "SpellScript.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" +#include "Unit.h" #ifdef _WIN32 #include diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 5e0a02da6..95df2c5b5 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -10,13 +10,13 @@ * Scriptnames of files in this file should be prefixed with "spell_dk_". */ -#include "ScriptMgr.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" -#include "Player.h" -#include "SpellInfo.h" -#include "Totem.h" #include "PetDefines.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellInfo.h" +#include "SpellScript.h" +#include "Totem.h" #include "UnitAI.h" enum DeathKnightSpells diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 7646d793e..af123e7fe 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -10,12 +10,12 @@ * Scriptnames of files in this file should be prefixed with "spell_dru_". */ -#include "Player.h" -#include "ScriptMgr.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" #include "Containers.h" #include "GridNotifiers.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum DruidSpells { diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 7b28c9aff..876bae8fe 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -11,14 +11,13 @@ * Scriptnames of files in this file should be prefixed with "spell_gen_" */ -#include -#include "ScriptMgr.h" #include "Battlefield.h" #include "BattlefieldMgr.h" #include "Battleground.h" #include "BattlegroundMgr.h" #include "Cell.h" #include "CellImpl.h" +#include "Chat.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "Group.h" @@ -26,11 +25,12 @@ #include "LFGMgr.h" #include "Pet.h" #include "ReputationMgr.h" +#include "ScriptMgr.h" #include "SkillDiscovery.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" -#include "Chat.h" +#include "SpellScript.h" #include "Vehicle.h" +#include // Ours class spell_gen_model_visible : public SpellScriptLoader diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 5e9c08476..26c9af643 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -10,14 +10,14 @@ * Scriptnames of files in this file should be prefixed with "spell_hun_". */ -#include "Pet.h" -#include "ScriptMgr.h" #include "Cell.h" #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "SpellScript.h" +#include "Pet.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" enum HunterSpells { diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 7445ef165..16d09e39b 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -10,13 +10,13 @@ * Scriptnames of files in this file should be prefixed with "spell_item_". */ -#include "Player.h" -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" -#include "SkillDiscovery.h" #include "Battleground.h" +#include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "SkillDiscovery.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" class spell_item_massive_seaforium_charge : public SpellScriptLoader { diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 8ad426f85..c4ed71cef 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -10,13 +10,13 @@ * Scriptnames of files in this file should be prefixed with "spell_mage_". */ -#include "ScriptMgr.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" -#include "Player.h" -#include "SpellMgr.h" -#include "TemporarySummon.h" #include "Pet.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellMgr.h" +#include "SpellScript.h" +#include "TemporarySummon.h" enum MageSpells { diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index ca4ee66b8..07f3b0579 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -10,11 +10,11 @@ * Scriptnames of files in this file should be prefixed with "spell_pal_". */ +#include "Group.h" #include "Player.h" #include "ScriptMgr.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" -#include "Group.h" +#include "SpellScript.h" #include "UnitAI.h" enum PaladinSpells diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index c07609288..58acbd773 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -10,11 +10,11 @@ * Scriptnames of files in this file should be prefixed with "spell_pri_". */ +#include "GridNotifiers.h" #include "Player.h" #include "ScriptMgr.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" -#include "GridNotifiers.h" +#include "SpellScript.h" enum PriestSpells { diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 3a051ff9d..515820b69 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -10,16 +10,16 @@ * Scriptnames of files in this file should be prefixed with "spell_q#questID_". */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "SpellScript.h" -#include "Vehicle.h" -#include "SpellAuras.h" +#include "CellImpl.h" +#include "CreatureTextMgr.h" #include "GridNotifiers.h" #include "MapManager.h" -#include "CreatureTextMgr.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" -#include "CellImpl.h" +#include "SpellAuras.h" +#include "SpellScript.h" +#include "Vehicle.h" // Ours class spell_q11065_wrangle_some_aether_rays : public SpellScriptLoader diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index bf7a57932..68c159b81 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -10,12 +10,12 @@ * Scriptnames of files in this file should be prefixed with "spell_rog_". */ -#include "ScriptMgr.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" +#include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "CellImpl.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum RogueSpells { diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 09ff7bb51..f3ac535cd 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -10,12 +10,12 @@ * Scriptnames of files in this file should be prefixed with "spell_sha_". */ -#include "ScriptMgr.h" #include "GridNotifiers.h" -#include "Unit.h" -#include "SpellScript.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" #include "TemporarySummon.h" +#include "Unit.h" enum ShamanSpells { diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index eda142d16..9859fec9f 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -10,11 +10,11 @@ * Scriptnames of files in this file should be prefixed with "spell_warl_". */ -#include "ScriptMgr.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" #include "Player.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" #include "SpellInfo.h" +#include "SpellScript.h" #include "TemporarySummon.h" enum WarlockSpells diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 9fe90847a..a2c2dc918 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -10,11 +10,11 @@ * Scriptnames of files in this file should be prefixed with "spell_warr_". */ -#include "ScriptMgr.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" #include "Player.h" +#include "ScriptMgr.h" +#include "SpellAuraEffects.h" #include "SpellInfo.h" +#include "SpellScript.h" enum WarriorSpells { diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp index 7429665e8..ec22ff33a 100644 --- a/src/server/scripts/World/achievement_scripts.cpp +++ b/src/server/scripts/World/achievement_scripts.cpp @@ -4,16 +4,15 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" - #include "BattlegroundAB.h" -#include "BattlegroundWS.h" -#include "BattlegroundIC.h" #include "BattlegroundAV.h" +#include "BattlegroundIC.h" #include "BattlegroundSA.h" -#include "Vehicle.h" -#include "Player.h" +#include "BattlegroundWS.h" #include "Creature.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "Vehicle.h" class achievement_resilient_victory : public AchievementCriteriaScript { diff --git a/src/server/scripts/World/action_ip_logger.cpp b/src/server/scripts/World/action_ip_logger.cpp index ddff84fdf..23884f04a 100644 --- a/src/server/scripts/World/action_ip_logger.cpp +++ b/src/server/scripts/World/action_ip_logger.cpp @@ -3,10 +3,10 @@ * Copyright (C) 2008-2016 TrinityCore */ -#include "ScriptMgr.h" #include "Channel.h" -#include "Guild.h" #include "Group.h" +#include "Guild.h" +#include "ScriptMgr.h" enum IPLoggingTypes { diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 8340086db..38a1b6c25 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -23,9 +23,9 @@ at_brewfest at_area_52_entrance EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellMgr.h" // Ours diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index 85c7c585f..a6d53151a 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -4,14 +4,14 @@ * Copyright (C) 2005-2009 MaNGOS */ +#include "GridNotifiers.h" #include "ObjectMgr.h" -#include "ScriptMgr.h" +#include "PassiveAI.h" #include "ScriptedCreature.h" -#include "SpellScript.h" +#include "ScriptMgr.h" #include "Spell.h" #include "SpellAuraEffects.h" -#include "PassiveAI.h" -#include "GridNotifiers.h" +#include "SpellScript.h" // // Emerald Dragon NPCs and IDs (kept here for reference) diff --git a/src/server/scripts/World/character_creation.cpp b/src/server/scripts/World/character_creation.cpp index 31c8e9a34..189dbec4e 100644 --- a/src/server/scripts/World/character_creation.cpp +++ b/src/server/scripts/World/character_creation.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "Player.h" +#include "ScriptMgr.h" enum Creationabilities { diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp index bdb70f3c5..5cc2ad40e 100644 --- a/src/server/scripts/World/chat_log.cpp +++ b/src/server/scripts/World/chat_log.cpp @@ -4,10 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "ScriptMgr.h" #include "Channel.h" -#include "Guild.h" #include "Group.h" +#include "Guild.h" +#include "ScriptMgr.h" class ChatLogScript : public PlayerScript { diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index fe01ea813..71c13340d 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -30,15 +30,15 @@ go_hive_pod go_veil_skith_cage EndContentData */ -#include "ScriptMgr.h" +#include "CellImpl.h" +#include "GameObjectAI.h" +#include "GridNotifiersImpl.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "GameObjectAI.h" +#include "ScriptMgr.h" #include "Spell.h" -#include "Player.h" #include "WorldSession.h" -#include "GridNotifiersImpl.h" -#include "CellImpl.h" // Ours /*###### diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index def6de3c4..fc4112f8f 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -17,10 +17,10 @@ guard_shattrath_aldor guard_shattrath_scryer EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "GuardAI.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #include "SpellInfo.h" enum GuardShattrath diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index c2357a4ca..40533055c 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -18,10 +18,10 @@ item_gor_dreks_ointment(i30175) Protecting Our Own(q10488) item_only_for_flight Items which should only useable while flying EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "Spell.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" +#include "Spell.h" /*##### # item_only_for_flight diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index 117e00e54..90e6fd440 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -11,9 +11,9 @@ SDComment: Should be replaced with core based AI SDCategory: Creatures EndScriptData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "PassiveAI.h" +#include "ScriptedCreature.h" +#include "ScriptMgr.h" #define GENERIC_CREATURE_COOLDOWN 5000 diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index 1e1aa8c17..0fd8f47b2 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -1,9 +1,9 @@ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "GameEventMgr.h" #include "Player.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "WorldSession.h" enum eTrickOrTreatSpells diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 456ebd539..91ea7b952 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -11,10 +11,10 @@ SDComment: Provides learn/unlearn/relearn-options for professions. Not supported SDCategory: NPCs EndScriptData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "Player.h" +#include "ScriptMgr.h" #include "SpellInfo.h" #include "WorldSession.h" diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp index 53ac29b47..e162ebfa1 100644 --- a/src/server/scripts/World/npc_taxi.cpp +++ b/src/server/scripts/World/npc_taxi.cpp @@ -12,10 +12,10 @@ SDCategory: NPCs EndScriptData */ -#include "ScriptMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "Player.h" +#include "ScriptMgr.h" #include "WorldSession.h" #define GOSSIP_SUSURRUS "I am ready." diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 16410f7f7..2020587f8 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -26,29 +26,29 @@ npc_locksmith 75% list of keys needs to be confirmed npc_firework 100% NPC's summoned by rockets and rocket clusters, for making them cast visual EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptedEscortAI.h" -#include "ObjectMgr.h" -#include "ScriptMgr.h" -#include "World.h" +#include "Cell.h" +#include "CellImpl.h" +#include "Chat.h" +#include "CombatAI.h" #include "CreatureTextMgr.h" -#include "PassiveAI.h" +#include "DBCStructure.h" #include "GameEventMgr.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "Cell.h" -#include "CellImpl.h" -#include "SpellAuras.h" -#include "CombatAI.h" +#include "Group.h" +#include "ObjectMgr.h" +#include "PassiveAI.h" #include "PassiveAI.h" #include "Pet.h" -#include "Chat.h" -#include "Group.h" -#include "WaypointManager.h" +#include "ScriptedCreature.h" +#include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" +#include "ScriptMgr.h" +#include "ScriptMgr.h" #include "SmartAI.h" -#include "DBCStructure.h" +#include "SpellAuras.h" +#include "WaypointManager.h" +#include "World.h" enum elderClearwater { diff --git a/src/server/shared/DataStores/DBCDatabaseLoader.cpp b/src/server/shared/DataStores/DBCDatabaseLoader.cpp index 30eb30f6c..eae21926c 100644 --- a/src/server/shared/DataStores/DBCDatabaseLoader.cpp +++ b/src/server/shared/DataStores/DBCDatabaseLoader.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "DBCDatabaseLoader.h" #include "Common.h" #include "DatabaseEnv.h" +#include "DBCDatabaseLoader.h" #include "Errors.h" #include "Log.h" #include "StringFormat.h" diff --git a/src/server/shared/DataStores/DBCStore.cpp b/src/server/shared/DataStores/DBCStore.cpp index 3a707bb83..6ecc9f6fc 100644 --- a/src/server/shared/DataStores/DBCStore.cpp +++ b/src/server/shared/DataStores/DBCStore.cpp @@ -4,8 +4,8 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "DBCStore.h" #include "DBCDatabaseLoader.h" +#include "DBCStore.h" DBCStorageBase::DBCStorageBase(char const* fmt) : _fieldCount(0), _fileFormat(fmt), _dataTable(nullptr), _indexTableSize(0) { diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h index d28bca149..97b8b643c 100644 --- a/src/server/shared/DataStores/DBCStore.h +++ b/src/server/shared/DataStores/DBCStore.h @@ -10,9 +10,9 @@ #include "Common.h" #include "DBCStorageIterator.h" #include "Errors.h" -#include -#include #include +#include +#include // Structures for M4 file. Source: https://wowdev.wiki template diff --git a/src/server/shared/DataStores/DBCStructure.h b/src/server/shared/DataStores/DBCStructure.h index bbfd10225..8f967a559 100644 --- a/src/server/shared/DataStores/DBCStructure.h +++ b/src/server/shared/DataStores/DBCStructure.h @@ -10,8 +10,8 @@ #include "Common.h" #include "DBCEnums.h" #include "Define.h" -#include "Util.h" #include "SharedDefines.h" +#include "Util.h" // Structures using to access raw DBC data and required packing to portability diff --git a/src/server/shared/Network/RealmSocket.cpp b/src/server/shared/Network/RealmSocket.cpp index 7583c9757..31eb63e12 100644 --- a/src/server/shared/Network/RealmSocket.cpp +++ b/src/server/shared/Network/RealmSocket.cpp @@ -4,12 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include -#include -#include - -#include "RealmSocket.h" #include "Log.h" +#include "RealmSocket.h" +#include +#include +#include RealmSocket::Session::Session() = default; diff --git a/src/server/shared/Network/RealmSocket.h b/src/server/shared/Network/RealmSocket.h index 9d45ab9d9..8c552ecfa 100644 --- a/src/server/shared/Network/RealmSocket.h +++ b/src/server/shared/Network/RealmSocket.h @@ -7,11 +7,11 @@ #ifndef __REALMSOCKET_H__ #define __REALMSOCKET_H__ -#include -#include -#include -#include #include "Common.h" +#include +#include +#include +#include class RealmSocket : public ACE_Svc_Handler { diff --git a/src/server/shared/Realms/RealmList.cpp b/src/server/shared/Realms/RealmList.cpp index 6a9065775..bcd51170e 100644 --- a/src/server/shared/Realms/RealmList.cpp +++ b/src/server/shared/Realms/RealmList.cpp @@ -5,8 +5,8 @@ */ #include "Common.h" -#include "RealmList.h" #include "DatabaseEnv.h" +#include "RealmList.h" RealmList::RealmList() : m_NextUpdateTime(time(nullptr)) { } diff --git a/src/server/worldserver/ACSoap/ACSoap.cpp b/src/server/worldserver/ACSoap/ACSoap.cpp index e27f24e23..c650e3cab 100644 --- a/src/server/worldserver/ACSoap/ACSoap.cpp +++ b/src/server/worldserver/ACSoap/ACSoap.cpp @@ -5,9 +5,9 @@ */ #include "ACSoap.h" +#include "Log.h" #include "soapH.h" #include "soapStub.h" -#include "Log.h" #include "World.h" void ACSoapRunnable::run() diff --git a/src/server/worldserver/ACSoap/ACSoap.h b/src/server/worldserver/ACSoap/ACSoap.h index c0fc513b8..e5e641b88 100644 --- a/src/server/worldserver/ACSoap/ACSoap.h +++ b/src/server/worldserver/ACSoap/ACSoap.h @@ -7,9 +7,8 @@ #ifndef _ACSOAP_H #define _ACSOAP_H -#include "Define.h" #include "AccountMgr.h" - +#include "Define.h" #include #include #include diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index 9a2c75339..b84b7352e 100644 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -8,20 +8,19 @@ /// @{ /// \file -#include "Common.h" -#include "ObjectMgr.h" -#include "World.h" -#include "WorldSession.h" -#include "Configuration/Config.h" - #include "AccountMgr.h" #include "Chat.h" #include "CliRunnable.h" +#include "Common.h" +#include "Configuration/Config.h" #include "Language.h" #include "Log.h" #include "MapManager.h" +#include "ObjectMgr.h" #include "Player.h" #include "Util.h" +#include "World.h" +#include "WorldSession.h" #if AC_PLATFORM != AC_PLATFORM_WINDOWS #include diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index fdfd37934..9629ac98d 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -8,16 +8,14 @@ /// @{ /// \file -#include -#include -#include - #include "Common.h" -#include "Database/DatabaseEnv.h" #include "Configuration/Config.h" - +#include "Database/DatabaseEnv.h" #include "Log.h" #include "Master.h" +#include +#include +#include #ifndef _ACORE_CORE_CONFIG #define _ACORE_CORE_CONFIG "worldserver.conf" diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 4d35dbea9..cda2cf098 100644 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -8,28 +8,27 @@ \ingroup Trinityd */ +#include "ACSoap.h" +#include "BigNumber.h" +#include "CliRunnable.h" #include "Common.h" +#include "Config.h" +#include "DatabaseEnv.h" +#include "DatabaseWorkerPool.h" #include "GitRevision.h" +#include "Log.h" +#include "Master.h" +#include "OpenSSLCrypto.h" +#include "RARunnable.h" +#include "RealmList.h" +#include "ScriptMgr.h" #include "SignalHandler.h" +#include "Timer.h" +#include "Util.h" #include "World.h" #include "WorldRunnable.h" #include "WorldSocket.h" #include "WorldSocketMgr.h" -#include "Config.h" -#include "DatabaseEnv.h" -#include "DatabaseWorkerPool.h" - -#include "CliRunnable.h" -#include "Log.h" -#include "Master.h" -#include "RARunnable.h" -#include "ACSoap.h" -#include "Timer.h" -#include "Util.h" -#include "RealmList.h" -#include "ScriptMgr.h" -#include "BigNumber.h" -#include "OpenSSLCrypto.h" #include #ifdef _WIN32 diff --git a/src/server/worldserver/PrecompiledHeaders/worldPCH.h b/src/server/worldserver/PrecompiledHeaders/worldPCH.h index f94dd953b..d32ad791a 100644 --- a/src/server/worldserver/PrecompiledHeaders/worldPCH.h +++ b/src/server/worldserver/PrecompiledHeaders/worldPCH.h @@ -1,8 +1,8 @@ #include "WorldSocket.h" // must be first to make ACE happy with ACE includes in it #include "Common.h" -#include "World.h" -#include "Log.h" -#include "Database/DatabaseEnv.h" #include "Configuration/Config.h" +#include "Database/DatabaseEnv.h" +#include "Log.h" #include "Util.h" +#include "World.h" diff --git a/src/server/worldserver/RemoteAccess/RARunnable.cpp b/src/server/worldserver/RemoteAccess/RARunnable.cpp index 6c8be506b..8e02fe628 100644 --- a/src/server/worldserver/RemoteAccess/RARunnable.cpp +++ b/src/server/worldserver/RemoteAccess/RARunnable.cpp @@ -12,15 +12,13 @@ #include "Config.h" #include "Log.h" #include "RARunnable.h" -#include "World.h" - -#include -#include -#include -#include -#include - #include "RASocket.h" +#include "World.h" +#include +#include +#include +#include +#include RARunnable::RARunnable() { diff --git a/src/server/worldserver/RemoteAccess/RARunnable.h b/src/server/worldserver/RemoteAccess/RARunnable.h index 2d182bcdf..688c24641 100644 --- a/src/server/worldserver/RemoteAccess/RARunnable.h +++ b/src/server/worldserver/RemoteAccess/RARunnable.h @@ -12,7 +12,6 @@ #define _ACORE_RARUNNABLE_H_ #include "Common.h" - #include class RARunnable : public acore::Runnable diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp index 1918885fa..8891e3cb5 100644 --- a/src/server/worldserver/RemoteAccess/RASocket.cpp +++ b/src/server/worldserver/RemoteAccess/RASocket.cpp @@ -8,17 +8,17 @@ \ingroup Trinityd */ +#include "AccountMgr.h" #include "Common.h" #include "Configuration/Config.h" #include "Database/DatabaseEnv.h" -#include "AccountMgr.h" +#include "Duration.h" #include "Log.h" #include "RASocket.h" -#include "Util.h" -#include "Duration.h" -#include "World.h" -#include "SHA1.h" #include "ServerMotd.h" +#include "SHA1.h" +#include "Util.h" +#include "World.h" #include RASocket::RASocket() diff --git a/src/server/worldserver/RemoteAccess/RASocket.h b/src/server/worldserver/RemoteAccess/RASocket.h index 79ca20394..23338aaad 100644 --- a/src/server/worldserver/RemoteAccess/RASocket.h +++ b/src/server/worldserver/RemoteAccess/RASocket.h @@ -12,11 +12,10 @@ #define _RASOCKET_H #include "Common.h" - -#include -#include -#include #include +#include +#include +#include #include /// Remote Administration socket diff --git a/src/server/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp index 52f754307..21ea9751b 100644 --- a/src/server/worldserver/WorldThread/WorldRunnable.cpp +++ b/src/server/worldserver/WorldThread/WorldRunnable.cpp @@ -8,19 +8,19 @@ \ingroup Trinityd */ -#include "Common.h" -#include "ObjectAccessor.h" -#include "World.h" -#include "WorldSocketMgr.h" -#include "Database/DatabaseEnv.h" -#include "ScriptMgr.h" -#include "BattlegroundMgr.h" -#include "MapManager.h" -#include "Timer.h" -#include "WorldRunnable.h" -#include "OutdoorPvPMgr.h" -#include "AvgDiffTracker.h" #include "AsyncAuctionListing.h" +#include "AvgDiffTracker.h" +#include "BattlegroundMgr.h" +#include "Common.h" +#include "Database/DatabaseEnv.h" +#include "MapManager.h" +#include "ObjectAccessor.h" +#include "OutdoorPvPMgr.h" +#include "ScriptMgr.h" +#include "Timer.h" +#include "World.h" +#include "WorldRunnable.h" +#include "WorldSocketMgr.h" #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/test/mocks/WorldMock.h b/src/test/mocks/WorldMock.h index 534555daa..e328cfa9f 100644 --- a/src/test/mocks/WorldMock.h +++ b/src/test/mocks/WorldMock.h @@ -5,9 +5,9 @@ #ifndef AZEROTHCORE_WORLDMOCK_H #define AZEROTHCORE_WORLDMOCK_H +#include "ArenaSpectator.h" #include "gmock/gmock.h" #include "IWorld.h" -#include "ArenaSpectator.h" #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" diff --git a/src/test/server/game/Miscellaneous/FormulasTest.cpp b/src/test/server/game/Miscellaneous/FormulasTest.cpp index 096445b92..d9c70fdba 100644 --- a/src/test/server/game/Miscellaneous/FormulasTest.cpp +++ b/src/test/server/game/Miscellaneous/FormulasTest.cpp @@ -2,8 +2,8 @@ * Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "gtest/gtest.h" #include "Formulas.h" +#include "gtest/gtest.h" #include "LogMock.h" #include "WorldMock.h"