From f62664c9874bda6a49c67872c2e951eeabff56ce Mon Sep 17 00:00:00 2001 From: Kargatum Date: Mon, 22 Nov 2021 17:24:39 +0700 Subject: [PATCH] refactor(Core/Misc): headers cleanup (#9259) --- src/common/Logging/enuminfo_LogCommon.cpp | 2 +- src/common/Metric/Metric.cpp | 2 +- src/common/Metric/Metric.h | 2 +- src/common/Threading/MPSCQueue.h | 1 + src/common/Utilities/StartProcess.cpp | 2 +- src/common/Utilities/Util.cpp | 2 +- src/common/Utilities/Util.h | 3 --- src/server/authserver/Main.cpp | 2 +- .../authserver/PrecompiledHeaders/authPCH.h | 2 +- src/server/authserver/Server/AuthSession.cpp | 4 +-- src/server/authserver/Server/AuthSession.h | 6 ++--- src/server/authserver/Server/AuthSocketMgr.h | 2 +- .../database/Database/DatabaseWorkerPool.cpp | 2 +- .../database/PrecompiledHeaders/databasePCH.h | 2 +- src/server/database/Updater/DBUpdater.h | 2 +- src/server/database/Updater/UpdateFetcher.cpp | 2 +- src/server/database/Updater/UpdateFetcher.h | 2 +- src/server/game/AI/CoreAI/GuardAI.cpp | 2 +- src/server/game/AI/CoreAI/PassiveAI.cpp | 2 +- src/server/game/AI/CoreAI/PetAI.cpp | 3 ++- src/server/game/AI/CoreAI/ReactorAI.cpp | 2 +- src/server/game/AI/CoreAI/TotemAI.cpp | 2 +- src/server/game/AI/CoreAI/UnitAI.cpp | 2 +- src/server/game/AI/CreatureAI.cpp | 2 +- src/server/game/AI/CreatureAIRegistry.cpp | 2 +- src/server/game/AI/CreatureAISelector.cpp | 2 +- .../game/AI/ScriptedAI/ScriptedCreature.cpp | 2 +- .../game/AI/ScriptedAI/ScriptedEscortAI.cpp | 2 +- .../game/AI/ScriptedAI/ScriptedFollowerAI.cpp | 2 +- .../game/AI/ScriptedAI/ScriptedFollowerAI.h | 3 ++- .../game/AI/ScriptedAI/ScriptedGossip.cpp | 2 +- src/server/game/AI/SmartScripts/SmartAI.cpp | 4 +-- .../game/AI/SmartScripts/SmartScript.cpp | 2 +- .../game/AI/SmartScripts/SmartScriptMgr.cpp | 2 +- .../game/AI/SmartScripts/SmartScriptMgr.h | 4 +-- src/server/game/Accounts/AccountMgr.cpp | 2 +- .../game/Achievements/AchievementMgr.cpp | 4 +-- src/server/game/Achievements/AchievementMgr.h | 9 +++---- .../game/ArenaSpectator/ArenaSpectator.cpp | 1 + .../game/AuctionHouse/AuctionHouseMgr.cpp | 4 +-- .../game/AuctionHouse/AuctionHouseMgr.h | 2 +- .../game/Battlefield/Zones/BattlefieldWG.h | 2 +- src/server/game/Battlegrounds/ArenaTeam.h | 2 +- .../game/Battlegrounds/Battleground.cpp | 2 +- .../game/Battlegrounds/BattlegroundMgr.cpp | 2 +- .../game/Battlegrounds/BattlegroundQueue.h | 2 +- .../Battlegrounds/Zones/BattlegroundBE.cpp | 1 + .../Battlegrounds/Zones/BattlegroundDS.cpp | 1 + .../Battlegrounds/Zones/BattlegroundIC.cpp | 2 +- .../Battlegrounds/Zones/BattlegroundRL.cpp | 1 + .../Battlegrounds/Zones/BattlegroundRV.cpp | 3 ++- .../Battlegrounds/Zones/BattlegroundWS.cpp | 2 +- src/server/game/Cache/WhoListCacheMgr.h | 2 +- src/server/game/Calendar/CalendarMgr.h | 2 +- src/server/game/Chat/Channels/ChannelMgr.cpp | 1 + src/server/game/Chat/Chat.h | 2 +- .../game/Chat/ChatCommands/ChatCommand.h | 4 +-- .../game/Chat/ChatCommands/ChatCommandTags.h | 4 +-- src/server/game/Chat/HyperlinkTags.cpp | 2 +- src/server/game/Chat/Hyperlinks.cpp | 4 +-- src/server/game/Combat/HostileRefMgr.cpp | 2 +- src/server/game/Combat/ThreatMgr.cpp | 2 +- src/server/game/Combat/ThreatMgr.h | 3 ++- src/server/game/DataStores/DBCStores.cpp | 2 +- src/server/game/DungeonFinding/LFG.cpp | 2 +- .../game/DungeonFinding/LFGGroupData.cpp | 2 +- src/server/game/DungeonFinding/LFGMgr.cpp | 6 ++--- .../game/DungeonFinding/LFGPlayerData.cpp | 2 +- src/server/game/DungeonFinding/LFGQueue.cpp | 2 +- src/server/game/DungeonFinding/LFGScripts.cpp | 8 +++--- src/server/game/Entities/Corpse/Corpse.cpp | 3 ++- .../game/Entities/Creature/Creature.cpp | 2 +- .../game/Entities/Creature/CreatureData.h | 2 +- .../game/Entities/Creature/CreatureGroups.cpp | 4 +-- .../Entities/Creature/TemporarySummon.cpp | 2 +- .../game/Entities/GameObject/GameObject.cpp | 2 +- src/server/game/Entities/Item/Item.cpp | 3 ++- .../game/Entities/Item/ItemEnchantmentMgr.cpp | 4 +-- .../game/Entities/Item/enuminfo_Item.cpp | 2 +- src/server/game/Entities/Object/Object.cpp | 2 +- src/server/game/Entities/Object/Object.h | 4 +-- .../game/Entities/Object/ObjectGuid.cpp | 2 +- src/server/game/Entities/Object/ObjectGuid.h | 2 +- .../game/Entities/Object/ObjectPosSelector.h | 2 +- .../game/Entities/Player/KillRewarder.cpp | 13 +++++----- .../game/Entities/Player/KillRewarder.h | 13 +++++++++- .../game/Entities/Player/PlayerGossip.cpp | 3 +++ .../game/Entities/Player/PlayerMisc.cpp | 2 ++ .../game/Entities/Player/PlayerQuest.cpp | 5 +++- .../game/Entities/Player/PlayerStorage.cpp | 7 ++--- .../game/Entities/Player/PlayerTaxi.cpp | 1 + src/server/game/Entities/Player/PlayerTaxi.h | 15 ++++++++++- .../game/Entities/Player/PlayerUpdates.cpp | 4 +-- src/server/game/Entities/Player/SocialMgr.cpp | 2 +- src/server/game/Entities/Player/SocialMgr.h | 1 + src/server/game/Entities/Player/TradeData.cpp | 1 + src/server/game/Entities/Player/TradeData.h | 18 ++++++++++--- src/server/game/Entities/Totem/Totem.cpp | 2 +- .../game/Entities/Transport/Transport.cpp | 2 +- src/server/game/Entities/Unit/Unit.cpp | 4 +-- src/server/game/Entities/Unit/Unit.h | 2 +- .../game/Entities/Unit/enuminfo_Unit.cpp | 2 +- src/server/game/Entities/Vehicle/Vehicle.cpp | 2 +- src/server/game/Events/GameEventMgr.cpp | 2 +- src/server/game/Globals/ObjectAccessor.cpp | 2 +- src/server/game/Globals/ObjectMgr.cpp | 4 +-- src/server/game/Grids/GridDefines.h | 2 +- .../game/Grids/Notifiers/GridNotifiers.cpp | 1 + .../game/Grids/Notifiers/GridNotifiersImpl.h | 2 ++ src/server/game/Grids/ObjectGridLoader.cpp | 2 +- src/server/game/Groups/Group.cpp | 2 +- src/server/game/Groups/GroupMgr.cpp | 4 +-- src/server/game/Groups/GroupReference.cpp | 2 +- src/server/game/Guilds/Guild.cpp | 4 +-- src/server/game/Guilds/GuildMgr.cpp | 2 +- .../game/Handlers/AuctionHouseHandler.cpp | 2 +- src/server/game/Handlers/CalendarHandler.cpp | 2 +- src/server/game/Handlers/CharacterHandler.cpp | 1 + src/server/game/Handlers/DuelHandler.cpp | 1 + src/server/game/Handlers/ItemHandler.cpp | 1 + src/server/game/Handlers/MailHandler.cpp | 2 +- src/server/game/Handlers/MovementHandler.cpp | 4 +-- src/server/game/Handlers/PetHandler.cpp | 2 +- src/server/game/Handlers/SkillHandler.cpp | 2 ++ src/server/game/Handlers/TradeHandler.cpp | 1 + src/server/game/Instances/InstanceSaveMgr.cpp | 2 +- src/server/game/Instances/InstanceSaveMgr.h | 2 +- src/server/game/Instances/InstanceScript.cpp | 4 ++- src/server/game/Instances/InstanceScript.h | 2 -- src/server/game/Loot/LootMgr.cpp | 2 +- src/server/game/Mails/Mail.cpp | 5 ++-- src/server/game/Mails/Mail.h | 2 ++ src/server/game/Maps/Map.cpp | 5 ++-- src/server/game/Maps/Map.h | 4 ++- src/server/game/Maps/MapInstanced.cpp | 4 +-- src/server/game/Maps/MapMgr.cpp | 6 ++--- src/server/game/Maps/MapMgr.h | 2 +- src/server/game/Maps/MapUpdater.cpp | 2 +- src/server/game/Maps/TransportMgr.cpp | 2 +- src/server/game/Maps/TransportMgr.h | 1 + src/server/game/Misc/AsyncAuctionListing.cpp | 1 + src/server/game/Misc/BanMgr.cpp | 2 +- src/server/game/Misc/GameGraveyard.cpp | 4 +-- src/server/game/Miscellaneous/Formulas.cpp | 2 +- src/server/game/Motd/ServerMotd.cpp | 2 +- src/server/game/Movement/MotionMaster.cpp | 3 ++- .../EscortMovementGenerator.cpp | 2 +- .../FleeingMovementGenerator.cpp | 2 +- .../IdleMovementGenerator.cpp | 2 +- .../MovementGenerators/PathGenerator.cpp | 6 ++--- .../MovementGenerators/PathGenerator.h | 2 +- .../PointMovementGenerator.cpp | 3 ++- .../RandomMovementGenerator.cpp | 2 +- .../TargetedMovementGenerator.cpp | 2 +- .../WaypointMovementGenerator.cpp | 2 +- .../game/Movement/Spline/MoveSpline.cpp | 2 +- .../game/Movement/Spline/MoveSplineInit.cpp | 4 +-- .../Movement/Spline/MovementPacketBuilder.cpp | 2 +- src/server/game/Movement/Spline/Spline.h | 2 +- .../game/Movement/Waypoints/WaypointMgr.cpp | 2 +- src/server/game/OutdoorPvP/OutdoorPvP.cpp | 2 +- src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp | 2 +- src/server/game/Petitions/PetitionMgr.cpp | 3 ++- src/server/game/Pools/PoolMgr.cpp | 2 +- src/server/game/Quests/QuestDef.cpp | 2 +- src/server/game/Quests/QuestDef.h | 4 +-- src/server/game/Quests/enuminfo_QuestDef.cpp | 2 +- src/server/game/Reputation/ReputationMgr.cpp | 4 +-- src/server/game/Scripting/MapScripts.cpp | 2 +- src/server/game/Scripting/ScriptMgr.cpp | 8 +++--- src/server/game/Scripting/ScriptSystem.cpp | 2 +- .../game/Server/Packets/PacketUtilities.cpp | 4 +-- src/server/game/Server/Protocol/Opcodes.cpp | 2 +- src/server/game/Server/WorldPacket.h | 4 +-- src/server/game/Server/WorldSession.h | 4 +-- src/server/game/Server/WorldSocket.h | 4 +-- src/server/game/Server/WorldSocketMgr.cpp | 2 +- src/server/game/Skills/SkillDiscovery.cpp | 2 +- src/server/game/Skills/SkillExtraItems.cpp | 3 ++- .../game/Spells/Auras/SpellAuraEffects.cpp | 2 +- src/server/game/Spells/Spell.cpp | 8 +++--- src/server/game/Spells/SpellEffects.cpp | 1 + src/server/game/Spells/SpellInfo.cpp | 2 +- src/server/game/Spells/SpellMgr.cpp | 2 +- src/server/game/Spells/SpellScript.cpp | 2 +- src/server/game/Texts/CreatureTextMgr.cpp | 2 +- src/server/game/Texts/CreatureTextMgr.h | 1 + src/server/game/Tickets/TicketMgr.cpp | 3 ++- src/server/game/Tickets/TicketMgr.h | 1 + .../game/Tools/CharacterDatabaseCleaner.cpp | 2 +- src/server/game/Tools/PlayerDump.cpp | 4 +-- src/server/game/Tools/PlayerDump.h | 5 ++-- src/server/game/Warden/Warden.cpp | 2 +- src/server/game/Warden/WardenCheckMgr.cpp | 2 +- src/server/game/Warden/WardenMac.cpp | 3 ++- src/server/game/Warden/WardenMac.h | 2 +- src/server/game/Warden/WardenWin.cpp | 3 ++- src/server/game/Warden/WardenWin.h | 2 +- .../game/Warden/enuminfo_WardenCheckMgr.cpp | 2 +- src/server/game/Weather/Weather.cpp | 2 +- src/server/game/Weather/WeatherMgr.cpp | 2 +- src/server/scripts/Commands/PlayerCommand.cpp | 26 +++++++++++++++++-- src/server/scripts/Commands/PlayerCommand.h | 18 ++++++------- src/server/scripts/Commands/cs_account.cpp | 2 +- .../scripts/Commands/cs_achievement.cpp | 2 +- src/server/scripts/Commands/cs_bf.cpp | 2 +- src/server/scripts/Commands/cs_cache.cpp | 2 +- src/server/scripts/Commands/cs_cast.cpp | 2 +- src/server/scripts/Commands/cs_character.cpp | 4 +-- src/server/scripts/Commands/cs_cheat.cpp | 2 +- src/server/scripts/Commands/cs_debug.cpp | 2 +- src/server/scripts/Commands/cs_deserter.cpp | 2 +- src/server/scripts/Commands/cs_event.cpp | 2 +- src/server/scripts/Commands/cs_gm.cpp | 2 +- src/server/scripts/Commands/cs_honor.cpp | 2 +- src/server/scripts/Commands/cs_instance.cpp | 2 +- src/server/scripts/Commands/cs_learn.cpp | 3 ++- src/server/scripts/Commands/cs_lfg.cpp | 4 +-- src/server/scripts/Commands/cs_list.cpp | 4 +-- src/server/scripts/Commands/cs_lookup.cpp | 1 + src/server/scripts/Commands/cs_message.cpp | 4 +-- src/server/scripts/Commands/cs_misc.cpp | 5 ++-- src/server/scripts/Commands/cs_mmaps.cpp | 2 +- src/server/scripts/Commands/cs_player.cpp | 2 +- src/server/scripts/Commands/cs_reload.cpp | 6 ++--- src/server/scripts/Commands/cs_server.cpp | 4 +-- src/server/scripts/Commands/cs_tele.cpp | 2 +- src/server/scripts/Commands/cs_titles.cpp | 2 +- .../AlteracValley/alterac_valley.cpp | 2 +- .../AlteracValley/boss_balinda.cpp | 2 +- .../AlteracValley/boss_drekthar.cpp | 2 +- .../AlteracValley/boss_galvangar.cpp | 2 +- .../AlteracValley/boss_vanndar.cpp | 2 +- .../BlackrockDepths/blackrock_depths.cpp | 2 +- .../boss_ambassador_flamelash.cpp | 4 +-- .../BlackrockDepths/boss_anubshiah.cpp | 4 +-- .../boss_emperor_dagran_thaurissan.cpp | 4 +-- .../boss_general_angerforge.cpp | 4 +-- .../boss_gorosh_the_dervish.cpp | 4 +-- .../BlackrockDepths/boss_grizzle.cpp | 4 +-- .../boss_high_interrogator_gerstahn.cpp | 4 +-- .../BlackrockDepths/boss_magmus.cpp | 4 +-- .../boss_moira_bronzebeard.cpp | 4 +-- .../BlackrockDepths/boss_tomb_of_seven.cpp | 4 +-- .../instance_blackrock_depths.cpp | 4 +-- .../BlackrockSpire/boss_drakkisath.cpp | 4 +-- .../BlackrockSpire/boss_gyth.cpp | 4 +-- .../BlackrockSpire/boss_halycon.cpp | 4 +-- .../BlackrockSpire/boss_highlord_omokk.cpp | 4 +-- .../BlackrockSpire/boss_lord_valthalak.cpp | 4 +-- .../boss_overlord_wyrmthalak.cpp | 4 +-- .../boss_pyroguard_emberseer.cpp | 4 +-- .../boss_quartermaster_zigris.cpp | 2 +- .../BlackrockSpire/boss_rend_blackhand.cpp | 4 +-- .../BlackrockSpire/boss_the_beast.cpp | 4 +-- .../BlackrockSpire/boss_urok_doomhowl.cpp | 4 +-- .../BlackrockSpire/boss_warmaster_voone.cpp | 4 +-- .../instance_blackrock_spire.cpp | 4 +-- .../boss_broodlord_lashlayer.cpp | 4 +-- .../BlackwingLair/boss_chromaggus.cpp | 4 +-- .../BlackwingLair/boss_ebonroc.cpp | 4 +-- .../BlackwingLair/boss_firemaw.cpp | 4 +-- .../BlackwingLair/boss_flamegor.cpp | 4 +-- .../BlackwingLair/boss_nefarian.cpp | 4 +-- .../BlackwingLair/boss_razorgore.cpp | 4 +-- .../BlackwingLair/boss_vaelastrasz.cpp | 4 +-- .../BlackwingLair/instance_blackwing_lair.cpp | 4 +-- .../MoltenCore/boss_baron_geddon.cpp | 2 +- .../MoltenCore/boss_garr.cpp | 2 +- .../MoltenCore/boss_golemagg.cpp | 4 +-- .../MoltenCore/boss_magmadar.cpp | 2 +- .../MoltenCore/boss_majordomo_executus.cpp | 6 ++--- .../MoltenCore/boss_shazzrah.cpp | 2 +- .../MoltenCore/instance_molten_core.cpp | 2 -- .../MoltenCore/molten_core.cpp | 2 +- .../MoltenCore/molten_core.h | 5 +++- .../Deadmines/boss_mr_smite.cpp | 4 +-- .../Deadmines/instance_deadmines.cpp | 2 +- .../Gnomeregan/instance_gnomeregan.cpp | 2 +- .../EasternKingdoms/Karazhan/boss_curator.cpp | 4 +-- .../Karazhan/boss_maiden_of_virtue.cpp | 4 +-- .../Karazhan/boss_midnight.cpp | 4 +-- .../EasternKingdoms/Karazhan/boss_moroes.cpp | 4 +-- .../Karazhan/boss_netherspite.cpp | 4 +-- .../Karazhan/boss_nightbane.cpp | 4 +-- .../Karazhan/boss_prince_malchezaar.cpp | 4 +-- .../Karazhan/boss_servant_quarters.cpp | 4 +-- .../Karazhan/boss_shade_of_aran.cpp | 4 +-- .../Karazhan/boss_terestian_illhoof.cpp | 4 +-- .../EasternKingdoms/Karazhan/bosses_opera.cpp | 4 +-- .../Karazhan/instance_karazhan.cpp | 2 +- .../EasternKingdoms/Karazhan/karazhan.cpp | 2 +- .../boss_felblood_kaelthas.cpp | 4 +-- .../boss_priestess_delrissa.cpp | 4 +-- .../MagistersTerrace/boss_selin_fireheart.cpp | 4 +-- .../MagistersTerrace/boss_vexallus.cpp | 4 +-- .../instance_magisters_terrace.cpp | 2 +- .../MagistersTerrace/magisters_terrace.h | 2 +- .../ScarletEnclave/chapter1.cpp | 2 +- .../ScarletEnclave/chapter2.cpp | 2 +- .../ScarletEnclave/chapter5.cpp | 2 +- .../zone_the_scarlet_enclave.cpp | 2 +- .../instance_scarlet_monastery.cpp | 4 +-- .../Scholomance/boss_darkmaster_gandling.cpp | 8 +++--- .../Scholomance/boss_kirtonos_the_herald.cpp | 4 +-- .../Scholomance/instance_scholomance.cpp | 4 +-- .../instance_shadowfang_keep.cpp | 2 +- .../Stratholme/boss_baroness_anastari.cpp | 2 +- .../Stratholme/instance_stratholme.cpp | 2 +- .../SunwellPlateau/boss_brutallus.cpp | 3 ++- .../SunwellPlateau/boss_eredar_twins.cpp | 2 +- .../SunwellPlateau/boss_felmyst.cpp | 2 +- .../SunwellPlateau/boss_kalecgos.cpp | 4 +-- .../SunwellPlateau/boss_kiljaeden.cpp | 2 +- .../SunwellPlateau/boss_muru.cpp | 2 +- .../EasternKingdoms/ZulAman/boss_akilzon.cpp | 2 +- .../EasternKingdoms/ZulAman/boss_halazzi.cpp | 2 +- .../EasternKingdoms/ZulAman/boss_hexlord.cpp | 2 +- .../EasternKingdoms/ZulAman/boss_janalai.cpp | 3 ++- .../EasternKingdoms/ZulAman/boss_nalorakk.cpp | 2 +- .../EasternKingdoms/ZulAman/boss_zuljin.cpp | 2 +- .../EasternKingdoms/ZulAman/zulaman.cpp | 4 +-- .../EasternKingdoms/ZulGurub/boss_arlokk.cpp | 2 +- .../ZulGurub/boss_gahzranka.cpp | 2 +- .../EasternKingdoms/ZulGurub/boss_grilek.cpp | 2 +- .../EasternKingdoms/ZulGurub/boss_hakkar.cpp | 4 +-- .../ZulGurub/boss_hazzarah.cpp | 2 +- .../EasternKingdoms/ZulGurub/boss_jeklik.cpp | 2 +- .../EasternKingdoms/ZulGurub/boss_jindo.cpp | 2 +- .../ZulGurub/boss_mandokir.cpp | 2 +- .../EasternKingdoms/ZulGurub/boss_marli.cpp | 2 +- .../ZulGurub/boss_renataki.cpp | 2 +- .../EasternKingdoms/ZulGurub/boss_thekal.cpp | 2 +- .../EasternKingdoms/ZulGurub/boss_venoxis.cpp | 2 +- .../ZulGurub/boss_wushoolay.cpp | 2 +- .../EasternKingdoms/zone_arathi_highlands.cpp | 2 +- .../EasternKingdoms/zone_blasted_lands.cpp | 2 +- .../EasternKingdoms/zone_burning_steppes.cpp | 2 +- .../scripts/EasternKingdoms/zone_duskwood.cpp | 2 +- .../zone_eastern_plaguelands.cpp | 2 +- .../EasternKingdoms/zone_ghostlands.cpp | 2 +- .../EasternKingdoms/zone_hinterlands.cpp | 2 +- .../zone_isle_of_queldanas.cpp | 2 +- .../zone_redridge_mountains.cpp | 2 +- .../zone_silverpine_forest.cpp | 2 +- .../EasternKingdoms/zone_stormwind_city.cpp | 2 +- .../zone_stranglethorn_vale.cpp | 2 +- .../EasternKingdoms/zone_tirisfal_glades.cpp | 2 +- .../EasternKingdoms/zone_undercity.cpp | 2 +- .../zone_western_plaguelands.cpp | 2 +- .../scripts/EasternKingdoms/zone_westfall.cpp | 2 +- .../scripts/EasternKingdoms/zone_wetlands.cpp | 2 +- src/server/scripts/Events/brewfest.cpp | 2 +- src/server/scripts/Events/childrens_week.cpp | 2 +- src/server/scripts/Events/hallows_end.cpp | 3 ++- src/server/scripts/Events/love_in_air.cpp | 2 +- src/server/scripts/Events/midsummer.cpp | 2 +- src/server/scripts/Events/pilgrims_bounty.cpp | 2 +- src/server/scripts/Events/winter_veil.cpp | 2 +- .../instance_blackfathom_deeps.cpp | 2 +- .../BattleForMountHyjal/boss_anetheron.cpp | 6 ++--- .../BattleForMountHyjal/boss_archimonde.cpp | 4 +-- .../BattleForMountHyjal/boss_azgalor.cpp | 6 ++--- .../BattleForMountHyjal/boss_kazrogal.cpp | 6 ++--- .../boss_rage_winterchill.cpp | 6 ++--- .../BattleForMountHyjal/hyjal.cpp | 4 +-- .../CavernsOfTime/BattleForMountHyjal/hyjal.h | 2 +- .../BattleForMountHyjal/hyjalAI.cpp | 4 +-- .../BattleForMountHyjal/hyjalAI.h | 2 +- .../BattleForMountHyjal/hyjal_trash.cpp | 4 +-- .../BattleForMountHyjal/hyjal_trash.h | 2 +- .../BattleForMountHyjal/instance_hyjal.cpp | 2 +- .../CullingOfStratholme/boss_epoch.cpp | 4 +-- .../CullingOfStratholme/boss_infinite.cpp | 4 +-- .../CullingOfStratholme/boss_mal_ganis.cpp | 4 +-- .../CullingOfStratholme/boss_meathook.cpp | 4 +-- .../CullingOfStratholme/boss_salramm.cpp | 4 +-- .../culling_of_stratholme.cpp | 2 +- .../instance_culling_of_stratholme.cpp | 4 +-- .../boss_captain_skarloc.cpp | 4 +-- .../boss_epoch_hunter.cpp | 4 +-- .../boss_lieutenant_drake.cpp | 4 +-- .../instance_old_hillsbrad.cpp | 4 +-- .../EscapeFromDurnholdeKeep/old_hillsbrad.cpp | 2 +- .../TheBlackMorass/boss_aeonus.cpp | 2 +- .../TheBlackMorass/boss_chrono_lord_deja.cpp | 2 +- .../TheBlackMorass/boss_temporus.cpp | 2 +- .../instance_the_black_morass.cpp | 2 +- .../TheBlackMorass/the_black_morass.cpp | 4 +-- .../Kalimdor/DireMaul/instance_dire_maul.cpp | 2 +- .../Kalimdor/Maraudon/instance_maraudon.cpp | 2 +- .../Kalimdor/OnyxiasLair/boss_onyxia.cpp | 4 +-- .../OnyxiasLair/instance_onyxias_lair.cpp | 4 +-- .../RazorfenDowns/instance_razorfen_downs.cpp | 2 +- .../Kalimdor/RazorfenDowns/razorfen_downs.cpp | 4 +-- .../Kalimdor/RazorfenDowns/razorfen_downs.h | 2 +- .../Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp | 4 +-- .../Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp | 4 +-- .../RuinsOfAhnQiraj/boss_kurinnaxx.cpp | 4 +-- .../Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp | 4 +-- .../RuinsOfAhnQiraj/boss_ossirian.cpp | 4 +-- .../Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp | 4 +-- .../instance_ruins_of_ahnqiraj.cpp | 2 +- .../TempleOfAhnQiraj/boss_bug_trio.cpp | 2 +- .../Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp | 2 +- .../TempleOfAhnQiraj/boss_fankriss.cpp | 2 +- .../TempleOfAhnQiraj/boss_huhuran.cpp | 2 +- .../Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp | 2 +- .../TempleOfAhnQiraj/boss_sartura.cpp | 2 +- .../Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp | 2 +- .../TempleOfAhnQiraj/boss_twinemperors.cpp | 4 +-- .../TempleOfAhnQiraj/boss_viscidus.cpp | 2 +- .../mob_anubisath_sentinel.cpp | 2 +- .../scripts/Kalimdor/ZulFarrak/zulfarrak.cpp | 14 +++++----- .../scripts/Kalimdor/ZulFarrak/zulfarrak.h | 2 +- src/server/scripts/Kalimdor/boss_azuregos.cpp | 2 +- .../scripts/Kalimdor/zone_ashenvale.cpp | 2 +- src/server/scripts/Kalimdor/zone_azshara.cpp | 2 +- .../scripts/Kalimdor/zone_azuremyst_isle.cpp | 2 +- .../scripts/Kalimdor/zone_bloodmyst_isle.cpp | 2 +- src/server/scripts/Kalimdor/zone_desolace.cpp | 2 +- src/server/scripts/Kalimdor/zone_durotar.cpp | 2 +- .../Kalimdor/zone_dustwallow_marsh.cpp | 2 +- src/server/scripts/Kalimdor/zone_felwood.cpp | 2 +- src/server/scripts/Kalimdor/zone_feralas.cpp | 2 +- .../scripts/Kalimdor/zone_moonglade.cpp | 2 +- .../scripts/Kalimdor/zone_orgrimmar.cpp | 2 +- src/server/scripts/Kalimdor/zone_silithus.cpp | 15 ++++++----- .../Kalimdor/zone_stonetalon_mountains.cpp | 2 +- src/server/scripts/Kalimdor/zone_tanaris.cpp | 2 +- .../scripts/Kalimdor/zone_the_barrens.cpp | 2 +- .../Kalimdor/zone_thousand_needles.cpp | 2 +- .../scripts/Kalimdor/zone_thunder_bluff.cpp | 2 +- .../scripts/Kalimdor/zone_ungoro_crater.cpp | 2 +- .../scripts/Kalimdor/zone_winterspring.cpp | 2 +- .../AzjolNerub/AzjolNerub/boss_anubarak.cpp | 4 +-- .../AzjolNerub/AzjolNerub/boss_hadronox.cpp | 4 +-- .../boss_krikthir_the_gatewatcher.cpp | 4 +-- .../AzjolNerub/instance_azjol_nerub.cpp | 4 +-- .../AzjolNerub/ahnkahet/boss_amanitar.cpp | 4 +-- .../AzjolNerub/ahnkahet/boss_elder_nadox.cpp | 4 +-- .../ahnkahet/boss_herald_volazj.cpp | 4 +-- .../ahnkahet/boss_jedoga_shadowseeker.cpp | 8 +++--- .../ahnkahet/boss_prince_taldaram.cpp | 6 ++--- .../AzjolNerub/ahnkahet/instance_ahnkahet.cpp | 4 +-- .../ObsidianSanctum/boss_sartharion.cpp | 4 +-- .../instance_obsidian_sanctum.cpp | 4 +-- .../boss_baltharus_the_warborn.cpp | 4 +-- .../RubySanctum/boss_general_zarithrian.cpp | 4 +-- .../RubySanctum/boss_halion.cpp | 5 ++-- .../RubySanctum/boss_saviana_ragefire.cpp | 4 +-- .../RubySanctum/instance_ruby_sanctum.cpp | 2 +- .../boss_argent_challenge.cpp | 2 +- .../TrialOfTheChampion/boss_black_knight.cpp | 2 +- .../boss_grand_champions.cpp | 4 +-- .../instance_trial_of_the_champion.cpp | 4 +-- .../trial_of_the_champion.cpp | 4 +-- .../boss_anubarak_trial.cpp | 2 +- .../boss_faction_champions.cpp | 2 +- .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 2 +- .../boss_northrend_beasts.cpp | 4 +-- .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 2 +- .../instance_trial_of_the_crusader.cpp | 2 +- .../trial_of_the_crusader.cpp | 4 +-- .../trial_of_the_crusader.h | 2 +- .../Northrend/DraktharonKeep/boss_dred.cpp | 4 +-- .../Northrend/DraktharonKeep/boss_novos.cpp | 4 +-- .../DraktharonKeep/boss_tharon_ja.cpp | 4 +-- .../DraktharonKeep/boss_trollgore.cpp | 4 +-- .../instance_drak_tharon_keep.cpp | 4 +-- .../ForgeOfSouls/boss_bronjahm.cpp | 4 +-- .../ForgeOfSouls/boss_devourer_of_souls.cpp | 4 +-- .../ForgeOfSouls/forge_of_souls.cpp | 2 +- .../FrozenHalls/ForgeOfSouls/forge_of_souls.h | 2 +- .../ForgeOfSouls/instance_forge_of_souls.cpp | 4 +-- .../HallsOfReflection/halls_of_reflection.h | 2 +- .../instance_halls_of_reflection.cpp | 2 +- .../PitOfSaron/boss_forgemaster_garfrost.cpp | 4 +-- .../PitOfSaron/boss_krickandick.cpp | 4 +-- .../PitOfSaron/boss_scourgelord_tyrannus.cpp | 4 +-- .../PitOfSaron/instance_pit_of_saron.cpp | 4 +-- .../FrozenHalls/PitOfSaron/pit_of_saron.cpp | 4 +-- .../Gundrak/boss_drakkari_colossus.cpp | 4 +-- .../scripts/Northrend/Gundrak/boss_eck.cpp | 4 +-- .../Northrend/Gundrak/boss_gal_darah.cpp | 4 +-- .../Northrend/Gundrak/boss_moorabi.cpp | 4 +-- .../Northrend/Gundrak/boss_slad_ran.cpp | 4 +-- .../scripts/Northrend/Gundrak/gundrak.h | 2 +- .../Northrend/Gundrak/instance_gundrak.cpp | 4 +-- .../boss_blood_prince_council.cpp | 4 +-- .../boss_blood_queen_lana_thel.cpp | 4 +-- .../boss_deathbringer_saurfang.cpp | 4 +-- .../IcecrownCitadel/boss_festergut.cpp | 4 +-- .../boss_icecrown_gunship_battle.cpp | 2 +- .../boss_lady_deathwhisper.cpp | 4 +-- .../IcecrownCitadel/boss_lord_marrowgar.cpp | 6 ++--- .../boss_professor_putricide.cpp | 12 +++++---- .../IcecrownCitadel/boss_rotface.cpp | 4 +-- .../IcecrownCitadel/boss_sindragosa.cpp | 6 ++--- .../IcecrownCitadel/boss_the_lich_king.cpp | 12 ++++----- .../boss_valithria_dreamwalker.cpp | 8 +++--- .../IcecrownCitadel/icecrown_citadel.cpp | 4 +-- .../icecrown_citadel_teleport.cpp | 4 +-- .../instance_icecrown_citadel.cpp | 4 +-- .../Northrend/Naxxramas/boss_anubrekhan.cpp | 4 +-- .../Northrend/Naxxramas/boss_faerlina.cpp | 4 +-- .../Naxxramas/boss_four_horsemen.cpp | 4 +-- .../Northrend/Naxxramas/boss_gluth.cpp | 4 +-- .../Northrend/Naxxramas/boss_gothik.cpp | 13 ++++++---- .../Northrend/Naxxramas/boss_grobbulus.cpp | 8 +++--- .../Northrend/Naxxramas/boss_heigan.cpp | 4 +-- .../Northrend/Naxxramas/boss_kelthuzad.cpp | 4 +-- .../Northrend/Naxxramas/boss_loatheb.cpp | 4 +-- .../Northrend/Naxxramas/boss_maexxna.cpp | 4 +-- .../scripts/Northrend/Naxxramas/boss_noth.cpp | 4 +-- .../Northrend/Naxxramas/boss_patchwerk.cpp | 4 +-- .../Northrend/Naxxramas/boss_razuvious.cpp | 4 +-- .../Northrend/Naxxramas/boss_sapphiron.cpp | 4 +-- .../Northrend/Naxxramas/boss_thaddius.cpp | 4 +-- .../Naxxramas/instance_naxxramas.cpp | 4 +-- .../scripts/Northrend/Naxxramas/naxxramas.h | 2 +- .../Nexus/EyeOfEternity/boss_malygos.cpp | 4 +-- .../instance_eye_of_eternity.cpp | 4 +-- .../Northrend/Nexus/Nexus/boss_anomalus.cpp | 4 +-- .../boss_commander_stoutbeard_kolurg.cpp | 4 +-- .../Nexus/Nexus/boss_keristrasza.cpp | 4 +-- .../Nexus/Nexus/boss_magus_telestra.cpp | 4 +-- .../Northrend/Nexus/Nexus/boss_ormorok.cpp | 4 +-- .../Northrend/Nexus/Nexus/instance_nexus.cpp | 4 +-- .../Northrend/Nexus/Oculus/boss_drakos.cpp | 4 +-- .../Northrend/Nexus/Oculus/boss_eregos.cpp | 4 +-- .../Northrend/Nexus/Oculus/boss_urom.cpp | 4 +-- .../Northrend/Nexus/Oculus/boss_varos.cpp | 4 +-- .../Nexus/Oculus/instance_oculus.cpp | 4 +-- .../scripts/Northrend/Nexus/Oculus/oculus.cpp | 4 +-- .../HallsOfLightning/boss_bjarngrim.cpp | 4 +-- .../Ulduar/HallsOfLightning/boss_ionar.cpp | 4 +-- .../Ulduar/HallsOfLightning/boss_loken.cpp | 4 +-- .../Ulduar/HallsOfLightning/boss_volkhan.cpp | 4 +-- .../instance_halls_of_lightning.cpp | 4 +-- .../Ulduar/HallsOfStone/boss_krystallus.cpp | 4 +-- .../HallsOfStone/boss_maiden_of_grief.cpp | 4 +-- .../Ulduar/HallsOfStone/boss_sjonnir.cpp | 4 +-- .../Ulduar/HallsOfStone/brann_bronzebeard.cpp | 4 +-- .../HallsOfStone/instance_halls_of_stone.cpp | 4 +-- .../Ulduar/boss_algalon_the_observer.cpp | 2 +- .../Ulduar/Ulduar/boss_assembly_of_iron.cpp | 2 +- .../Northrend/Ulduar/Ulduar/boss_auriaya.cpp | 2 +- .../Ulduar/Ulduar/boss_flame_leviathan.cpp | 4 +-- .../Northrend/Ulduar/Ulduar/boss_freya.cpp | 2 +- .../Ulduar/Ulduar/boss_general_vezax.cpp | 4 +-- .../Northrend/Ulduar/Ulduar/boss_hodir.cpp | 2 +- .../Northrend/Ulduar/Ulduar/boss_ignis.cpp | 4 +-- .../Northrend/Ulduar/Ulduar/boss_kologarn.cpp | 7 ++--- .../Northrend/Ulduar/Ulduar/boss_mimiron.cpp | 4 +-- .../Ulduar/Ulduar/boss_razorscale.cpp | 4 +-- .../Northrend/Ulduar/Ulduar/boss_thorim.cpp | 2 +- .../Northrend/Ulduar/Ulduar/boss_xt002.cpp | 4 +-- .../Ulduar/Ulduar/boss_yoggsaron.cpp | 2 +- .../Ulduar/Ulduar/instance_ulduar.cpp | 4 +-- .../Northrend/Ulduar/Ulduar/ulduar.cpp | 4 +-- .../UtgardeKeep/boss_ingvar_the_plunderer.cpp | 2 +- .../UtgardeKeep/UtgardeKeep/boss_keleseth.cpp | 2 +- .../UtgardeKeep/boss_skarvald_dalronn.cpp | 2 +- .../UtgardeKeep/instance_utgarde_keep.cpp | 2 +- .../UtgardeKeep/UtgardeKeep/utgarde_keep.cpp | 6 ++--- .../UtgardeKeep/UtgardeKeep/utgarde_keep.h | 2 +- .../UtgardePinnacle/boss_palehoof.cpp | 2 +- .../UtgardePinnacle/boss_skadi.cpp | 4 +-- .../UtgardePinnacle/boss_svala.cpp | 2 +- .../UtgardePinnacle/boss_ymiron.cpp | 2 +- .../instance_utgarde_pinnacle.cpp | 2 +- .../UtgardePinnacle/utgarde_pinnacle.h | 2 +- .../VaultOfArchavon/boss_archavon.cpp | 2 +- .../Northrend/VaultOfArchavon/boss_emalon.cpp | 2 +- .../VaultOfArchavon/boss_koralon.cpp | 2 +- .../VaultOfArchavon/boss_toravon.cpp | 2 +- .../instance_vault_of_archavon.cpp | 2 +- .../Northrend/VioletHold/boss_cyanigosa.cpp | 2 +- .../Northrend/VioletHold/boss_erekem.cpp | 2 +- .../Northrend/VioletHold/boss_ichoron.cpp | 2 +- .../Northrend/VioletHold/boss_lavanthor.cpp | 2 +- .../Northrend/VioletHold/boss_moragg.cpp | 2 +- .../Northrend/VioletHold/boss_xevozz.cpp | 2 +- .../Northrend/VioletHold/boss_zuramat.cpp | 2 +- .../VioletHold/instance_violet_hold.cpp | 2 +- .../Northrend/VioletHold/violet_hold.cpp | 4 +-- .../scripts/Northrend/isle_of_conquest.cpp | 2 +- .../scripts/Northrend/zone_borean_tundra.cpp | 3 +-- .../Northrend/zone_crystalsong_forest.cpp | 2 +- src/server/scripts/Northrend/zone_dalaran.cpp | 2 +- .../scripts/Northrend/zone_dragonblight.cpp | 3 ++- .../scripts/Northrend/zone_grizzly_hills.cpp | 3 +-- .../scripts/Northrend/zone_howling_fjord.cpp | 2 +- .../scripts/Northrend/zone_icecrown.cpp | 2 +- .../scripts/Northrend/zone_sholazar_basin.cpp | 2 +- .../scripts/Northrend/zone_storm_peaks.cpp | 2 +- .../scripts/Northrend/zone_wintergrasp.cpp | 2 +- src/server/scripts/Northrend/zone_zuldrak.cpp | 2 +- .../scripts/OutdoorPvP/OutdoorPvPEP.cpp | 2 +- .../scripts/OutdoorPvP/OutdoorPvPGH.cpp | 2 +- .../scripts/OutdoorPvP/OutdoorPvPHP.cpp | 2 +- .../scripts/OutdoorPvP/OutdoorPvPNA.cpp | 4 +-- .../scripts/OutdoorPvP/OutdoorPvPSI.cpp | 2 +- .../scripts/OutdoorPvP/OutdoorPvPTF.cpp | 2 +- .../scripts/OutdoorPvP/OutdoorPvPZM.cpp | 3 ++- .../AuchenaiCrypts/boss_exarch_maladaar.cpp | 4 +-- .../boss_shirrak_the_dead_watcher.cpp | 4 +-- .../instance_auchenai_crypts.cpp | 2 +- .../ManaTombs/boss_nexusprince_shaffar.cpp | 2 +- .../Auchindoun/ManaTombs/boss_pandemonius.cpp | 4 +-- .../ManaTombs/instance_mana_tombs.cpp | 2 +- .../SethekkHalls/boss_talon_king_ikiss.cpp | 2 +- .../boss_ambassador_hellmaw.cpp | 2 +- .../boss_blackheart_the_inciter.cpp | 2 +- .../boss_grandmaster_vorpil.cpp | 2 +- .../ShadowLabyrinth/boss_murmur.cpp | 4 +-- .../Outland/BlackTemple/boss_bloodboil.cpp | 4 +-- .../Outland/BlackTemple/boss_illidan.cpp | 4 +-- .../BlackTemple/boss_mother_shahraz.cpp | 4 +-- .../BlackTemple/boss_reliquary_of_souls.cpp | 4 +-- .../BlackTemple/boss_shade_of_akama.cpp | 4 +-- .../Outland/BlackTemple/boss_supremus.cpp | 4 +-- .../BlackTemple/boss_teron_gorefiend.cpp | 6 ++--- .../BlackTemple/boss_warlord_najentus.cpp | 4 +-- .../Outland/BlackTemple/illidari_council.cpp | 11 +++++--- .../BlackTemple/instance_black_temple.cpp | 2 +- .../boss_fathomlord_karathress.cpp | 2 +- .../boss_hydross_the_unstable.cpp | 2 +- .../SerpentShrine/boss_lady_vashj.cpp | 4 +-- .../boss_leotheras_the_blind.cpp | 2 +- .../SerpentShrine/boss_lurker_below.cpp | 2 +- .../boss_morogrim_tidewalker.cpp | 2 +- .../SerpentShrine/instance_serpent_shrine.cpp | 2 +- .../SlavePens/boss_ahune.cpp | 2 +- .../SteamVault/boss_hydromancer_thespia.cpp | 2 +- .../SteamVault/boss_mekgineer_steamrigger.cpp | 2 +- .../SteamVault/boss_warlord_kalithresh.cpp | 2 +- .../SteamVault/steam_vault.h | 2 +- .../underbog/boss_the_black_stalker.cpp | 2 +- .../scripts/Outland/GruulsLair/boss_gruul.cpp | 4 +-- .../GruulsLair/boss_high_king_maulgar.cpp | 4 +-- .../GruulsLair/instance_gruuls_lair.cpp | 2 +- .../BloodFurnace/blood_furnace.h | 2 +- .../BloodFurnace/boss_broggok.cpp | 4 +-- .../BloodFurnace/boss_kelidan_the_breaker.cpp | 4 +-- .../BloodFurnace/boss_the_maker.cpp | 4 +-- .../BloodFurnace/instance_blood_furnace.cpp | 2 +- .../boss_omor_the_unscarred.cpp | 4 +-- .../boss_vazruden_the_herald.cpp | 4 +-- .../boss_watchkeeper_gargolmar.cpp | 4 +-- .../HellfireRamparts/hellfire_ramparts.h | 2 +- .../instance_hellfire_ramparts.cpp | 2 +- .../MagtheridonsLair/boss_magtheridon.cpp | 4 +-- .../instance_magtheridons_lair.cpp | 4 +-- .../MagtheridonsLair/magtheridons_lair.h | 2 +- .../ShatteredHalls/boss_nethekurse.cpp | 2 +- .../ShatteredHalls/boss_warbringer_omrogg.cpp | 2 +- .../boss_warchief_kargath_bladefist.cpp | 2 +- .../Outland/TempestKeep/Eye/boss_alar.cpp | 4 +-- .../Outland/TempestKeep/Eye/boss_kaelthas.cpp | 4 +-- .../TempestKeep/Eye/boss_void_reaver.cpp | 2 +- .../Mechanar/boss_gatewatcher_gyrokill.cpp | 4 +-- .../Mechanar/boss_gatewatcher_ironhand.cpp | 4 +-- .../Mechanar/boss_mechano_lord_capacitus.cpp | 4 +-- .../Mechanar/boss_nethermancer_sepethrea.cpp | 4 +-- .../boss_pathaleon_the_calculator.cpp | 4 +-- .../Mechanar/instance_mechanar.cpp | 2 +- .../Outland/TempestKeep/arcatraz/arcatraz.cpp | 2 +- .../arcatraz/boss_dalliah_the_doomsayer.cpp | 4 +-- .../arcatraz/boss_harbinger_skyriss.cpp | 4 +-- .../boss_wrath_scryer_soccothrates.cpp | 4 +-- .../arcatraz/boss_zereketh_the_unbound.cpp | 4 +-- .../arcatraz/instance_arcatraz.cpp | 2 +- .../botanica/boss_commander_sarannis.cpp | 2 +- .../botanica/boss_high_botanist_freywinn.cpp | 2 +- .../Outland/TempestKeep/botanica/boss_laj.cpp | 2 +- .../botanica/boss_thorngrin_the_tender.cpp | 2 +- .../botanica/boss_warp_splinter.cpp | 2 +- .../TempestKeep/botanica/the_botanica.h | 2 +- .../scripts/Outland/boss_doomlord_kazzak.cpp | 2 +- .../scripts/Outland/boss_doomwalker.cpp | 2 +- .../Outland/zone_blades_edge_mountains.cpp | 2 +- .../Outland/zone_hellfire_peninsula.cpp | 2 +- src/server/scripts/Outland/zone_nagrand.cpp | 2 +- .../scripts/Outland/zone_netherstorm.cpp | 2 +- .../Outland/zone_shadowmoon_valley.cpp | 2 +- .../scripts/Outland/zone_shattrath_city.cpp | 2 +- .../scripts/Outland/zone_terokkar_forest.cpp | 2 +- .../scripts/Outland/zone_zangarmarsh.cpp | 2 +- src/server/scripts/Pet/pet_dk.cpp | 3 ++- src/server/scripts/Pet/pet_generic.cpp | 2 +- src/server/scripts/Pet/pet_hunter.cpp | 2 +- src/server/scripts/Pet/pet_mage.cpp | 2 +- src/server/scripts/Pet/pet_priest.cpp | 2 +- src/server/scripts/Pet/pet_shaman.cpp | 2 +- src/server/scripts/ScriptPCH.h | 2 +- src/server/scripts/Spells/spell_dk.cpp | 1 + src/server/scripts/Spells/spell_druid.cpp | 1 + src/server/scripts/Spells/spell_hunter.cpp | 3 ++- src/server/scripts/Spells/spell_item.cpp | 3 ++- src/server/scripts/Spells/spell_paladin.cpp | 1 + src/server/scripts/Spells/spell_priest.cpp | 1 + src/server/scripts/Spells/spell_quest.cpp | 2 +- src/server/scripts/Spells/spell_rogue.cpp | 1 + src/server/scripts/Spells/spell_shaman.cpp | 1 + src/server/scripts/Spells/spell_warlock.cpp | 1 + src/server/scripts/Spells/spell_warrior.cpp | 1 + .../scripts/World/areatrigger_scripts.cpp | 2 +- .../scripts/World/boss_emerald_dragons.cpp | 2 +- src/server/scripts/World/go_scripts.cpp | 2 +- src/server/scripts/World/guards.cpp | 2 +- src/server/scripts/World/item_scripts.cpp | 2 +- .../scripts/World/mob_generic_creature.cpp | 2 +- src/server/scripts/World/npc_innkeeper.cpp | 3 ++- src/server/scripts/World/npc_professions.cpp | 2 +- .../scripts/World/npc_stave_of_ancients.cpp | 2 +- src/server/scripts/World/npc_taxi.cpp | 2 +- src/server/scripts/World/npcs_special.cpp | 2 +- .../shared/DataStores/DBCDatabaseLoader.cpp | 2 +- src/server/shared/DataStores/DBCStore.cpp | 2 +- src/server/shared/DataStores/DBCStructure.h | 4 +-- src/server/shared/Network/AsyncAcceptor.h | 2 +- src/server/shared/Network/NetworkThread.h | 4 +-- src/server/shared/Network/Socket.h | 10 +++---- src/server/shared/Packets/ByteBuffer.cpp | 6 ++--- src/server/shared/Packets/ByteBuffer.h | 4 +-- src/server/shared/Secrets/SecretMgr.h | 2 +- src/server/shared/enuminfo_SharedDefines.cpp | 2 +- src/server/worldserver/ACSoap/ACSoap.cpp | 2 +- .../worldserver/CommandLine/CliRunnable.cpp | 12 ++++----- src/test/mocks/WorldMock.h | 2 +- .../game/Miscellaneous/FormulasTest.cpp | 2 +- src/tools/map_extractor/System.cpp | 2 +- src/tools/map_extractor/mpq_libmpq.cpp | 2 +- src/tools/mesh_extractor/Cache.h | 10 +++---- src/tools/mesh_extractor/ChunkedData.h | 2 +- src/tools/mesh_extractor/ContinentBuilder.cpp | 12 ++++----- src/tools/mesh_extractor/ContinentBuilder.h | 4 +-- src/tools/mesh_extractor/DBC.cpp | 2 +- src/tools/mesh_extractor/DBC.h | 4 +-- src/tools/mesh_extractor/DoodadHandler.cpp | 4 +-- src/tools/mesh_extractor/DoodadHandler.h | 4 +-- src/tools/mesh_extractor/Geometry.cpp | 4 +-- src/tools/mesh_extractor/LiquidHandler.h | 2 +- src/tools/mesh_extractor/MPQ.cpp | 2 +- src/tools/mesh_extractor/MPQ.h | 8 +++--- src/tools/mesh_extractor/MPQMgr.cpp | 2 +- src/tools/mesh_extractor/MPQMgr.h | 2 +- src/tools/mesh_extractor/MapChunk.h | 2 +- src/tools/mesh_extractor/MeshExtractor.cpp | 10 +++---- src/tools/mesh_extractor/Model.h | 2 +- .../mesh_extractor/ObjectDataHandler.cpp | 2 +- src/tools/mesh_extractor/TileBuilder.cpp | 16 ++++++------ src/tools/mesh_extractor/TileBuilder.h | 2 +- src/tools/mesh_extractor/Utils.cpp | 4 +-- src/tools/mesh_extractor/Utils.h | 6 ++--- src/tools/mesh_extractor/WorldModelGroup.cpp | 2 +- .../mesh_extractor/WorldModelHandler.cpp | 6 ++--- src/tools/mesh_extractor/WorldModelHandler.h | 2 +- .../mmaps_generator/IntermediateValues.h | 6 ++--- src/tools/mmaps_generator/MapBuilder.h | 10 +++---- src/tools/mmaps_generator/PathGenerator.cpp | 2 +- src/tools/mmaps_generator/TerrainBuilder.cpp | 4 +-- src/tools/vmap4_assembler/VMapAssembler.cpp | 2 +- src/tools/vmap4_extractor/adtfile.cpp | 2 +- src/tools/vmap4_extractor/adtfile.h | 2 +- .../vmap4_extractor/gameobject_extract.cpp | 4 +-- src/tools/vmap4_extractor/model.cpp | 6 ++--- src/tools/vmap4_extractor/model.h | 2 +- src/tools/vmap4_extractor/mpq_libmpq.cpp | 2 +- src/tools/vmap4_extractor/vec3d.h | 2 +- src/tools/vmap4_extractor/vmapexport.cpp | 18 +++++-------- src/tools/vmap4_extractor/wdtfile.cpp | 2 +- src/tools/vmap4_extractor/wmo.cpp | 2 +- 775 files changed, 1294 insertions(+), 1165 deletions(-) diff --git a/src/common/Logging/enuminfo_LogCommon.cpp b/src/common/Logging/enuminfo_LogCommon.cpp index da8cbc4493..9f8ae25116 100644 --- a/src/common/Logging/enuminfo_LogCommon.cpp +++ b/src/common/Logging/enuminfo_LogCommon.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "LogCommon.h" #include "Define.h" +#include "LogCommon.h" #include "SmartEnum.h" #include diff --git a/src/common/Metric/Metric.cpp b/src/common/Metric/Metric.cpp index fb0e39a8c0..3127263998 100644 --- a/src/common/Metric/Metric.cpp +++ b/src/common/Metric/Metric.cpp @@ -21,8 +21,8 @@ #include "DeadlineTimer.h" #include "Log.h" #include "Strand.h" -#include "Util.h" #include "Tokenize.h" +#include "Util.h" #include #include diff --git a/src/common/Metric/Metric.h b/src/common/Metric/Metric.h index 5506303286..e629a5b313 100644 --- a/src/common/Metric/Metric.h +++ b/src/common/Metric/Metric.h @@ -26,8 +26,8 @@ #include #include #include -#include #include +#include namespace Acore::Asio { diff --git a/src/common/Threading/MPSCQueue.h b/src/common/Threading/MPSCQueue.h index 3f6b424570..ce26db40b8 100644 --- a/src/common/Threading/MPSCQueue.h +++ b/src/common/Threading/MPSCQueue.h @@ -19,6 +19,7 @@ #define MPSCQueue_h__ #include +#include #include namespace Acore::Impl diff --git a/src/common/Utilities/StartProcess.cpp b/src/common/Utilities/StartProcess.cpp index 2c4297fc9a..2bd58b2e82 100644 --- a/src/common/Utilities/StartProcess.cpp +++ b/src/common/Utilities/StartProcess.cpp @@ -20,7 +20,6 @@ #include "Log.h" #include "Optional.h" #include "Util.h" -#include #include #include #include @@ -30,6 +29,7 @@ #include #include #include +#include using namespace boost::process; using namespace boost::iostreams; diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index a942fd9a95..45ed122aca 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -21,13 +21,13 @@ #include "IpAddress.h" #include "StringFormat.h" #include +#include #include #include #include #include #include #include -#include #include Tokenizer::Tokenizer(const std::string& src, const char sep, uint32 vectorReserve) diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h index 4fbe541080..a3032ac91f 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -28,9 +28,6 @@ #include #include #include -#include -#include -#include // Searcher for map of structs template struct Finder diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index e5a39d9a1c..6a79401f7e 100644 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -33,8 +33,8 @@ #include "DeadlineTimer.h" #include "GitRevision.h" #include "IPLocation.h" -#include "Log.h" #include "IoContext.h" +#include "Log.h" #include "MySQLThreading.h" #include "ProcessPriority.h" #include "RealmList.h" diff --git a/src/server/authserver/PrecompiledHeaders/authPCH.h b/src/server/authserver/PrecompiledHeaders/authPCH.h index 3bd6189cef..e252912e7c 100644 --- a/src/server/authserver/PrecompiledHeaders/authPCH.h +++ b/src/server/authserver/PrecompiledHeaders/authPCH.h @@ -15,8 +15,8 @@ * with this program. If not, see . */ +#include "Common.h" #include "Config.h" #include "DatabaseEnv.h" #include "Log.h" #include "RealmList.h" -#include "Common.h" diff --git a/src/server/authserver/Server/AuthSession.cpp b/src/server/authserver/Server/AuthSession.cpp index a516b328ca..74aed6fe26 100644 --- a/src/server/authserver/Server/AuthSession.cpp +++ b/src/server/authserver/Server/AuthSession.cpp @@ -20,16 +20,16 @@ #include "AuthCodes.h" #include "Config.h" #include "CryptoGenerics.h" +#include "CryptoHash.h" #include "CryptoRandom.h" #include "DatabaseEnv.h" #include "Errors.h" -#include "CryptoHash.h" #include "IPLocation.h" #include "Log.h" #include "RealmList.h" #include "SecretMgr.h" -#include "Timer.h" #include "TOTP.h" +#include "Timer.h" #include "Util.h" #include #include diff --git a/src/server/authserver/Server/AuthSession.h b/src/server/authserver/Server/AuthSession.h index cf1d9ec80c..4a333c8168 100644 --- a/src/server/authserver/Server/AuthSession.h +++ b/src/server/authserver/Server/AuthSession.h @@ -24,11 +24,11 @@ #include "Common.h" #include "CryptoHash.h" #include "Optional.h" -#include "Socket.h" -#include "SRP6.h" #include "QueryResult.h" -#include +#include "SRP6.h" +#include "Socket.h" #include +#include using boost::asio::ip::tcp; diff --git a/src/server/authserver/Server/AuthSocketMgr.h b/src/server/authserver/Server/AuthSocketMgr.h index eb25b5fad4..53f46ff92a 100644 --- a/src/server/authserver/Server/AuthSocketMgr.h +++ b/src/server/authserver/Server/AuthSocketMgr.h @@ -18,8 +18,8 @@ #ifndef AuthSocketMgr_h__ #define AuthSocketMgr_h__ -#include "SocketMgr.h" #include "AuthSession.h" +#include "SocketMgr.h" class AuthSocketMgr : public SocketMgr { diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp index 6e7da4bf13..ea74da3573 100644 --- a/src/server/database/Database/DatabaseWorkerPool.cpp +++ b/src/server/database/Database/DatabaseWorkerPool.cpp @@ -25,8 +25,8 @@ #include "Log.h" #include "MySQLPreparedStatement.h" #include "MySQLWorkaround.h" -#include "PreparedStatement.h" #include "PCQueue.h" +#include "PreparedStatement.h" #include "QueryCallback.h" #include "QueryHolder.h" #include "QueryResult.h" diff --git a/src/server/database/PrecompiledHeaders/databasePCH.h b/src/server/database/PrecompiledHeaders/databasePCH.h index 8853e2b2d8..eeecef2120 100644 --- a/src/server/database/PrecompiledHeaders/databasePCH.h +++ b/src/server/database/PrecompiledHeaders/databasePCH.h @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "Define.h" #include "DatabaseEnvFwd.h" +#include "Define.h" #include "Errors.h" #include "Field.h" #include "Log.h" diff --git a/src/server/database/Updater/DBUpdater.h b/src/server/database/Updater/DBUpdater.h index 7d7d88f535..a086ab4350 100644 --- a/src/server/database/Updater/DBUpdater.h +++ b/src/server/database/Updater/DBUpdater.h @@ -20,8 +20,8 @@ #include "DatabaseEnv.h" #include "Define.h" -#include #include +#include template class DatabaseWorkerPool; diff --git a/src/server/database/Updater/UpdateFetcher.cpp b/src/server/database/Updater/UpdateFetcher.cpp index 2546152636..648d739b82 100644 --- a/src/server/database/Updater/UpdateFetcher.cpp +++ b/src/server/database/Updater/UpdateFetcher.cpp @@ -23,8 +23,8 @@ #include "QueryResult.h" #include "Tokenize.h" #include "Util.h" -#include #include +#include using namespace std::filesystem; diff --git a/src/server/database/Updater/UpdateFetcher.h b/src/server/database/Updater/UpdateFetcher.h index bb97e29f3e..c2b29936f9 100644 --- a/src/server/database/Updater/UpdateFetcher.h +++ b/src/server/database/Updater/UpdateFetcher.h @@ -20,11 +20,11 @@ #include "DatabaseEnv.h" #include "Define.h" +#include #include #include #include #include -#include struct AC_DATABASE_API UpdateResult { diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp index f0228abc24..3ece7c1916 100644 --- a/src/server/game/AI/CoreAI/GuardAI.cpp +++ b/src/server/game/AI/CoreAI/GuardAI.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "CreatureAIImpl.h" #include "GuardAI.h" +#include "CreatureAIImpl.h" #include "Player.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 2a0badb57b..12a1344901 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.cpp +++ b/src/server/game/AI/CoreAI/PassiveAI.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "Creature.h" #include "PassiveAI.h" +#include "Creature.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 9ab8a54cfc..27da4a5af1 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -15,18 +15,19 @@ * with this program. If not, see . */ +#include "PetAI.h" #include "Creature.h" #include "Errors.h" #include "Group.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 "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 8796b60bf8..a584b2d10a 100644 --- a/src/server/game/AI/CoreAI/ReactorAI.cpp +++ b/src/server/game/AI/CoreAI/ReactorAI.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "ReactorAI.h" #include "CreatureAIImpl.h" #include "Errors.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 ab54644f4f..141d5dacbf 100644 --- a/src/server/game/AI/CoreAI/TotemAI.cpp +++ b/src/server/game/AI/CoreAI/TotemAI.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "TotemAI.h" #include "CellImpl.h" #include "Creature.h" #include "DBCStores.h" @@ -23,7 +24,6 @@ #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 e373888ad3..0922a4f29f 100644 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "UnitAI.h" #include "Creature.h" #include "CreatureAIImpl.h" #include "Player.h" @@ -23,7 +24,6 @@ #include "SpellAuras.h" #include "SpellInfo.h" #include "SpellMgr.h" -#include "UnitAI.h" void UnitAI::AttackStart(Unit* victim) { diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 6aed4ea322..4e2c04e520 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "Creature.h" #include "CreatureAI.h" +#include "Creature.h" #include "CreatureAIImpl.h" #include "CreatureGroups.h" #include "CreatureTextMgr.h" diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp index 0c2cf8717d..f3d29e5beb 100644 --- a/src/server/game/AI/CreatureAIRegistry.cpp +++ b/src/server/game/AI/CreatureAIRegistry.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "CreatureAIRegistry.h" #include "CombatAI.h" #include "CreatureAIFactory.h" -#include "CreatureAIRegistry.h" #include "GuardAI.h" #include "MovementGeneratorImpl.h" #include "PassiveAI.h" diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp index 410f266def..9d32ee7242 100644 --- a/src/server/game/AI/CreatureAISelector.cpp +++ b/src/server/game/AI/CreatureAISelector.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "CreatureAISelector.h" #include "Creature.h" #include "CreatureAIFactory.h" -#include "CreatureAISelector.h" #include "MovementGenerator.h" #include "PassiveAI.h" #include "Pet.h" diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 43e1fe18b1..4aa6301623 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "ScriptedCreature.h" #include "Cell.h" #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "ObjectMgr.h" -#include "ScriptedCreature.h" #include "Spell.h" #include "TemporarySummon.h" diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 427c6eeeb7..ce5f3d1441 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -22,10 +22,10 @@ SDComment: SDCategory: Npc EndScriptData */ +#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/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index d5bebe8969..be9c327f6f 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -22,10 +22,10 @@ SDComment: This AI is under development SDCategory: Npc EndScriptData */ +#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/ScriptedFollowerAI.h b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h index 3686ebabdc..1f77602b56 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h @@ -19,6 +19,7 @@ #define SC_FOLLOWERAI_H #include "ScriptSystem.h" +#include "ScriptedCreature.h" enum eFollowState { @@ -35,7 +36,7 @@ class FollowerAI : public ScriptedAI { public: explicit FollowerAI(Creature* creature); - ~FollowerAI() override {} + ~FollowerAI() override { } //virtual void WaypointReached(uint32 uiPointId) = 0; diff --git a/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp index d162b69493..5f960b1caa 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "ScriptedGossip.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 619be1facf..8ac1fb64b4 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "SmartAI.h" #include "Cell.h" #include "CellImpl.h" #include "DatabaseEnv.h" @@ -25,9 +26,8 @@ #include "InstanceScript.h" #include "ObjectDefines.h" #include "ObjectMgr.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "SmartAI.h" +#include "ScriptedCreature.h" #include "SpellMgr.h" #include "Vehicle.h" diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 290d7575fc..cd48f96763 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "SmartScript.h" #include "Cell.h" #include "CellImpl.h" #include "ChatTextBuilder.h" @@ -33,7 +34,6 @@ #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SmartAI.h" -#include "SmartScript.h" #include "SpellMgr.h" #include "Vehicle.h" diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 1c99074af8..eafc2c828c 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "SmartScriptMgr.h" #include "Cell.h" #include "CellImpl.h" #include "CreatureTextMgr.h" @@ -27,7 +28,6 @@ #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 9ab0d9dd1f..91428c2d69 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -21,9 +21,9 @@ #include "Common.h" #include "Creature.h" #include "CreatureAI.h" +#include "DBCStores.h" #include "Spell.h" -//#include "SmartAI.h" -//#include "SmartScript.h" +#include "SpellMgr.h" #include "Unit.h" struct WayPoint diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index 93271f228b..62c75712e7 100644 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -19,8 +19,8 @@ #include "DatabaseEnv.h" #include "ObjectAccessor.h" #include "Player.h" -#include "ScriptMgr.h" #include "SRP6.h" +#include "ScriptMgr.h" #include "Util.h" #include "WorldSession.h" diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index d3af277c5e..94228f9762 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "AccountMgr.h" #include "AchievementMgr.h" +#include "AccountMgr.h" #include "ArenaTeam.h" #include "ArenaTeamMgr.h" #include "Battleground.h" @@ -25,8 +25,8 @@ #include "Chat.h" #include "ChatTextBuilder.h" #include "Common.h" -#include "DatabaseEnv.h" #include "DBCEnums.h" +#include "DatabaseEnv.h" #include "DisableMgr.h" #include "GameEventMgr.h" #include "GridNotifiersImpl.h" diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index 60c1c07b92..d5b83ee13a 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -18,15 +18,14 @@ #ifndef __ACORE_ACHIEVEMENTMGR_H #define __ACORE_ACHIEVEMENTMGR_H -#include -#include -#include - #include "Common.h" -#include "DatabaseEnv.h" #include "DBCEnums.h" #include "DBCStores.h" +#include "DatabaseEnv.h" #include "ObjectGuid.h" +#include +#include +#include typedef std::list AchievementCriteriaEntryList; typedef std::list AchievementEntryList; diff --git a/src/server/game/ArenaSpectator/ArenaSpectator.cpp b/src/server/game/ArenaSpectator/ArenaSpectator.cpp index d69635d10f..40f5a0084f 100644 --- a/src/server/game/ArenaSpectator/ArenaSpectator.cpp +++ b/src/server/game/ArenaSpectator/ArenaSpectator.cpp @@ -23,6 +23,7 @@ #include "Player.h" #include "SpellAuraEffects.h" #include "SpellAuras.h" +#include "Types.h" #include "World.h" bool ArenaSpectator::HandleSpectatorSpectateCommand(ChatHandler* handler, std::string const& name) diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 8c3fed695b..49cf8f5b35 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ +#include "AuctionHouseMgr.h" #include "AccountMgr.h" #include "AsyncAuctionListing.h" -#include "AuctionHouseMgr.h" #include "AvgDiffTracker.h" #include "Common.h" -#include "DatabaseEnv.h" #include "DBCStores.h" +#include "DatabaseEnv.h" #include "Item.h" #include "Logging/Log.h" #include "ObjectMgr.h" diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h index fdeb6c08dd..732bcb04c0 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.h +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h @@ -19,8 +19,8 @@ #define _AUCTION_HOUSE_MGR_H #include "Common.h" -#include "DatabaseEnv.h" #include "DBCStructure.h" +#include "DatabaseEnv.h" #include "EventProcessor.h" #include "ObjectGuid.h" #include "WorldPacket.h" diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h index 550e4133aa..902c4848b8 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.h +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h @@ -19,8 +19,8 @@ #define BATTLEFIELD_WG_ #include "Battlefield.h" -#include "ObjectAccessor.h" #include "Log.h" +#include "ObjectAccessor.h" #include "World.h" #include "WorldPacket.h" diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h index 6fce979c6e..3167377271 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.h +++ b/src/server/game/Battlegrounds/ArenaTeam.h @@ -70,7 +70,7 @@ enum ArenaTeamEvents }; // PLAYER_FIELD_ARENA_TEAM_INFO_1_1 offsets -enum ArenaTeamInfoType +enum ArenaTeamInfoType : uint8 { ARENA_TEAM_ID = 0, ARENA_TEAM_TYPE = 1, // new in 3.2 - team type? diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index 7f1415d8c0..1e5be91dc1 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "Battleground.h" #include "ArenaSpectator.h" #include "ArenaTeam.h" #include "ArenaTeamMgr.h" -#include "Battleground.h" #include "BattlegroundBE.h" #include "BattlegroundDS.h" #include "BattlegroundMgr.h" diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 89f7584eff..b31cfab92d 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "BattlegroundMgr.h" #include "ArenaTeam.h" #include "ArenaTeamMgr.h" #include "BattlegroundAB.h" @@ -23,7 +24,6 @@ #include "BattlegroundDS.h" #include "BattlegroundEY.h" #include "BattlegroundIC.h" -#include "BattlegroundMgr.h" #include "BattlegroundNA.h" #include "BattlegroundQueue.h" #include "BattlegroundRL.h" diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h index 9594d59a5b..bdc0f2a018 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.h +++ b/src/server/game/Battlegrounds/BattlegroundQueue.h @@ -22,8 +22,8 @@ #include "Common.h" #include "DBCEnums.h" #include "EventProcessor.h" -#include #include +#include #define COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME 10 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp index 6887da7c42..2801ffe3c3 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp @@ -17,6 +17,7 @@ #include "BattlegroundBE.h" #include "Language.h" +#include "Log.h" #include "Object.h" #include "ObjectMgr.h" #include "Player.h" diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp index 4c1624bdfb..38ebe13e2d 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp @@ -19,6 +19,7 @@ #include "Creature.h" #include "GameObject.h" #include "Language.h" +#include "Log.h" #include "ObjectAccessor.h" #include "Player.h" #include "WorldPacket.h" diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index a3984cb082..cf033f7ee8 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "Battleground.h" #include "BattlegroundIC.h" +#include "Battleground.h" #include "GameGraveyard.h" #include "GameObject.h" #include "Language.h" diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp index 1482efe884..1647022b41 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp @@ -17,6 +17,7 @@ #include "BattlegroundRL.h" #include "Language.h" +#include "Log.h" #include "Player.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp index 4e8d23b583..b608050cc8 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp @@ -15,10 +15,11 @@ * with this program. If not, see . */ -#include "Battleground.h" #include "BattlegroundRV.h" +#include "Battleground.h" #include "GameObject.h" #include "Language.h" +#include "Log.h" #include "ObjectAccessor.h" #include "Pet.h" #include "Player.h" diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index db6191c6f2..f8a30fe5f1 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "BattlegroundMgr.h" #include "BattlegroundWS.h" +#include "BattlegroundMgr.h" #include "GameGraveyard.h" #include "GameObject.h" #include "Language.h" diff --git a/src/server/game/Cache/WhoListCacheMgr.h b/src/server/game/Cache/WhoListCacheMgr.h index ebeab820e4..067c6246a3 100644 --- a/src/server/game/Cache/WhoListCacheMgr.h +++ b/src/server/game/Cache/WhoListCacheMgr.h @@ -19,8 +19,8 @@ #define _WHO_LISTCACHE_H_ #include "Common.h" -#include "SharedDefines.h" #include "ObjectGuid.h" +#include "SharedDefines.h" class WhoListPlayerInfo { diff --git a/src/server/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h index 35c51cafe2..e853a734ec 100644 --- a/src/server/game/Calendar/CalendarMgr.h +++ b/src/server/game/Calendar/CalendarMgr.h @@ -20,8 +20,8 @@ #include "Common.h" #include "DatabaseEnv.h" -#include "WorldPacket.h" #include "ObjectGuid.h" +#include "WorldPacket.h" #include enum CalendarMailAnswers diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp index 6769d7338c..3eaa648022 100644 --- a/src/server/game/Chat/Channels/ChannelMgr.cpp +++ b/src/server/game/Chat/Channels/ChannelMgr.cpp @@ -16,6 +16,7 @@ */ #include "ChannelMgr.h" +#include "Log.h" #include "Player.h" #include "World.h" diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 4b9f3ce215..d8c73611fd 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -19,8 +19,8 @@ #define AZEROTHCORE_CHAT_H #include "ChatCommand.h" -#include "SharedDefines.h" #include "Errors.h" +#include "SharedDefines.h" #include "WorldSession.h" #include diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.h b/src/server/game/Chat/ChatCommands/ChatCommand.h index 7caf208817..2fd8a1883e 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommand.h +++ b/src/server/game/Chat/ChatCommands/ChatCommand.h @@ -18,7 +18,6 @@ #ifndef _CHATCOMMAND_H #define _CHATCOMMAND_H -#include "advstd.h" #include "ChatCommandArgs.h" #include "ChatCommandTags.h" #include "Define.h" @@ -28,11 +27,12 @@ #include "Optional.h" #include "StringFormat.h" #include "Util.h" +#include "advstd.h" #include #include -#include #include #include +#include #include #include diff --git a/src/server/game/Chat/ChatCommands/ChatCommandTags.h b/src/server/game/Chat/ChatCommands/ChatCommandTags.h index 70e86c305a..75dd4cc532 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandTags.h +++ b/src/server/game/Chat/ChatCommands/ChatCommandTags.h @@ -18,14 +18,14 @@ #ifndef _CHATCOMMANDTAGS_H #define _CHATCOMMANDTAGS_H -#include "advstd.h" #include "ChatCommandHelpers.h" #include "Hyperlinks.h" #include "ObjectGuid.h" #include "Optional.h" #include "Util.h" -#include +#include "advstd.h" #include +#include #include #include #include diff --git a/src/server/game/Chat/HyperlinkTags.cpp b/src/server/game/Chat/HyperlinkTags.cpp index 9d2fe62f10..49efa0b2f5 100644 --- a/src/server/game/Chat/HyperlinkTags.cpp +++ b/src/server/game/Chat/HyperlinkTags.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "Hyperlinks.h" #include "AchievementMgr.h" +#include "Hyperlinks.h" #include "ObjectMgr.h" #include "SpellInfo.h" #include "SpellMgr.h" diff --git a/src/server/game/Chat/Hyperlinks.cpp b/src/server/game/Chat/Hyperlinks.cpp index b296242961..e817ac461f 100644 --- a/src/server/game/Chat/Hyperlinks.cpp +++ b/src/server/game/Chat/Hyperlinks.cpp @@ -16,15 +16,15 @@ */ #include "Hyperlinks.h" -#include "advstd.h" #include "Common.h" #include "DBCStores.h" #include "Errors.h" #include "ObjectMgr.h" +#include "QuestDef.h" #include "SharedDefines.h" #include "SpellInfo.h" #include "SpellMgr.h" -#include "QuestDef.h" +#include "advstd.h" using namespace Acore::Hyperlinks; diff --git a/src/server/game/Combat/HostileRefMgr.cpp b/src/server/game/Combat/HostileRefMgr.cpp index 63762da8a8..20b30a27ae 100644 --- a/src/server/game/Combat/HostileRefMgr.cpp +++ b/src/server/game/Combat/HostileRefMgr.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "CreatureAI.h" #include "HostileRefMgr.h" +#include "CreatureAI.h" #include "SpellInfo.h" #include "SpellMgr.h" #include "ThreatMgr.h" diff --git a/src/server/game/Combat/ThreatMgr.cpp b/src/server/game/Combat/ThreatMgr.cpp index 9b0ce1e3d3..81db04fa4d 100644 --- a/src/server/game/Combat/ThreatMgr.cpp +++ b/src/server/game/Combat/ThreatMgr.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "ThreatMgr.h" #include "Creature.h" #include "CreatureAI.h" #include "Map.h" @@ -23,7 +24,6 @@ #include "SpellAuras.h" #include "SpellInfo.h" #include "SpellMgr.h" -#include "ThreatMgr.h" #include "Unit.h" #include "UnitEvents.h" diff --git a/src/server/game/Combat/ThreatMgr.h b/src/server/game/Combat/ThreatMgr.h index 04f1836372..b09466ddcd 100644 --- a/src/server/game/Combat/ThreatMgr.h +++ b/src/server/game/Combat/ThreatMgr.h @@ -19,7 +19,8 @@ #define _THREATMANAGER #include "Common.h" -#include "LinkedReference/Reference.h" +#include "ObjectGuid.h" +#include "Reference.h" #include "SharedDefines.h" #include "UnitEvents.h" #include diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index fd4af3f559..fed9bd4b52 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "DBCStores.h" #include "BattlegroundMgr.h" #include "DBCFileLoader.h" #include "DBCfmt.h" -#include "DBCStores.h" #include "Errors.h" #include "Log.h" #include "SharedDefines.h" diff --git a/src/server/game/DungeonFinding/LFG.cpp b/src/server/game/DungeonFinding/LFG.cpp index 0f37ecbc19..2277a07840 100644 --- a/src/server/game/DungeonFinding/LFG.cpp +++ b/src/server/game/DungeonFinding/LFG.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "Language.h" #include "LFG.h" +#include "Language.h" #include "ObjectMgr.h" namespace lfg diff --git a/src/server/game/DungeonFinding/LFGGroupData.cpp b/src/server/game/DungeonFinding/LFGGroupData.cpp index bfe6528cac..c6fb1ce7a4 100644 --- a/src/server/game/DungeonFinding/LFGGroupData.cpp +++ b/src/server/game/DungeonFinding/LFGGroupData.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "LFG.h" #include "LFGGroupData.h" +#include "LFG.h" #include "World.h" namespace lfg diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 97ff244ab2..4a9bfb552b 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "LFGMgr.h" #include "CharacterCache.h" #include "Common.h" #include "DBCStores.h" @@ -22,12 +23,12 @@ #include "GameEventMgr.h" #include "Group.h" #include "GroupMgr.h" -#include "Language.h" +#include "InstanceSaveMgr.h" #include "LFGGroupData.h" -#include "LFGMgr.h" #include "LFGPlayerData.h" #include "LFGQueue.h" #include "LFGScripts.h" +#include "Language.h" #include "ObjectMgr.h" #include "Opcodes.h" #include "Player.h" @@ -38,7 +39,6 @@ namespace lfg { - LFGMgr::LFGMgr(): m_lfgProposalId(1), m_options(sWorld->getIntConfig(CONFIG_LFG_OPTIONSMASK)), m_Testing(false) { new LFGPlayerScript(); diff --git a/src/server/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp index fae09e736b..a063453ab3 100644 --- a/src/server/game/DungeonFinding/LFGPlayerData.cpp +++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "LFGMgr.h" #include "LFGPlayerData.h" +#include "LFGMgr.h" namespace lfg { diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp index 8f47db4210..408760220a 100644 --- a/src/server/game/DungeonFinding/LFGQueue.cpp +++ b/src/server/game/DungeonFinding/LFGQueue.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "LFGQueue.h" #include "Containers.h" #include "DBCStores.h" #include "Group.h" #include "InstanceScript.h" #include "LFGMgr.h" -#include "LFGQueue.h" #include "Log.h" #include "ObjectDefines.h" #include "ObjectMgr.h" diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index e6a46362db..15f03494b9 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -19,20 +19,18 @@ * Interaction between core and LFGScripts */ +#include "LFGScripts.h" #include "Group.h" #include "LFGMgr.h" -#include "LFGScripts.h" #include "ObjectAccessor.h" #include "Player.h" #include "ScriptMgr.h" #include "SharedDefines.h" +#include "WorldSession.h" namespace lfg { - - LFGPlayerScript::LFGPlayerScript() : PlayerScript("LFGPlayerScript") - { - } + LFGPlayerScript::LFGPlayerScript() : PlayerScript("LFGPlayerScript") { } void LFGPlayerScript::OnLevelChanged(Player* player, uint8 /*oldLevel*/) { diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp index 4fa4a667e1..fd204e4eb2 100644 --- a/src/server/game/Entities/Corpse/Corpse.cpp +++ b/src/server/game/Entities/Corpse/Corpse.cpp @@ -15,10 +15,11 @@ * with this program. If not, see . */ +#include "Corpse.h" #include "CharacterCache.h" #include "Common.h" -#include "Corpse.h" #include "DatabaseEnv.h" +#include "Log.h" #include "ObjectAccessor.h" #include "Opcodes.h" #include "Player.h" diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index c878b43213..1756478439 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "Creature.h" #include "BattlegroundMgr.h" #include "CellImpl.h" #include "Common.h" -#include "Creature.h" #include "CreatureAI.h" #include "CreatureAISelector.h" #include "CreatureGroups.h" diff --git a/src/server/game/Entities/Creature/CreatureData.h b/src/server/game/Entities/Creature/CreatureData.h index 6ce5565658..4e51a9c2c5 100644 --- a/src/server/game/Entities/Creature/CreatureData.h +++ b/src/server/game/Entities/Creature/CreatureData.h @@ -18,9 +18,9 @@ #ifndef AZEROTHCORE_CREATUREDATA_H #define AZEROTHCORE_CREATUREDATA_H -#include "DBCEnums.h" #include "Cell.h" #include "Common.h" +#include "DBCEnums.h" #include "DatabaseEnv.h" #include "ItemTemplate.h" #include "LootMgr.h" diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 86ffb9ca1d..783a107887 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "CreatureGroups.h" #include "Creature.h" #include "CreatureAI.h" -#include "CreatureGroups.h" +#include "Log.h" #include "MoveSplineInit.h" #include "ObjectMgr.h" -#include "Log.h" FormationMgr::~FormationMgr() { diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 0d3335a3b8..38d63299af 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ +#include "TemporarySummon.h" #include "CreatureAI.h" #include "Log.h" #include "ObjectAccessor.h" #include "Pet.h" #include "Player.h" #include "ScriptMgr.h" -#include "TemporarySummon.h" TempSummon::TempSummon(SummonPropertiesEntry const* properties, ObjectGuid owner, bool isWorldObject) : Creature(isWorldObject), m_Properties(properties), m_type(TEMPSUMMON_MANUAL_DESPAWN), diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 82e8d02470..ba01eba055 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -34,9 +34,9 @@ #include "Transport.h" #include "UpdateFieldFlags.h" #include "World.h" -#include #include #include +#include #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index cb27a9b2e2..9777846a8d 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "Item.h" #include "Common.h" #include "ConditionMgr.h" #include "DatabaseEnv.h" -#include "Item.h" #include "ItemEnchantmentMgr.h" #include "ObjectMgr.h" #include "Player.h" @@ -26,6 +26,7 @@ #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/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp index 048f601594..e016b7f5ea 100644 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "DatabaseEnv.h" -#include "DBCStores.h" #include "ItemEnchantmentMgr.h" +#include "DBCStores.h" +#include "DatabaseEnv.h" #include "Log.h" #include "ObjectMgr.h" #include "Util.h" diff --git a/src/server/game/Entities/Item/enuminfo_Item.cpp b/src/server/game/Entities/Item/enuminfo_Item.cpp index a7b1ecc352..d43ff64707 100644 --- a/src/server/game/Entities/Item/enuminfo_Item.cpp +++ b/src/server/game/Entities/Item/enuminfo_Item.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "Item.h" #include "Define.h" +#include "Item.h" #include "SmartEnum.h" #include diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 8ec4c85c85..e01d4f3b0a 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "Object.h" #include "Battlefield.h" #include "BattlefieldMgr.h" #include "CellImpl.h" @@ -28,7 +29,6 @@ #include "Log.h" #include "MapMgr.h" #include "MovementPacketBuilder.h" -#include "Object.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index a57b5e0f77..e43022d168 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -20,6 +20,7 @@ #include "Common.h" #include "DataMap.h" +#include "G3D/Vector3.h" #include "GridDefines.h" #include "GridReference.h" #include "Map.h" @@ -29,9 +30,8 @@ #include "UpdateData.h" #include "UpdateMask.h" #include -#include #include -#include "G3D/Vector3.h" +#include #ifdef ELUNA class ElunaEventProcessor; diff --git a/src/server/game/Entities/Object/ObjectGuid.cpp b/src/server/game/Entities/Object/ObjectGuid.cpp index 0db14d83d4..3c943adf4a 100644 --- a/src/server/game/Entities/Object/ObjectGuid.cpp +++ b/src/server/game/Entities/Object/ObjectGuid.cpp @@ -18,8 +18,8 @@ #include "ObjectGuid.h" #include "Log.h" #include "World.h" -#include #include +#include ObjectGuid const ObjectGuid::Empty = ObjectGuid(); diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h index 003ddd188f..25180008e0 100644 --- a/src/server/game/Entities/Object/ObjectGuid.h +++ b/src/server/game/Entities/Object/ObjectGuid.h @@ -26,8 +26,8 @@ #include #include #include -#include #include +#include enum TypeID { diff --git a/src/server/game/Entities/Object/ObjectPosSelector.h b/src/server/game/Entities/Object/ObjectPosSelector.h index 4c53f52e33..4baf0268c8 100644 --- a/src/server/game/Entities/Object/ObjectPosSelector.h +++ b/src/server/game/Entities/Object/ObjectPosSelector.h @@ -19,8 +19,8 @@ #define _OBJECT_POS_SELECTOR_H #include "Define.h" -#include #include +#include enum UsedPosType { USED_POS_PLUS, USED_POS_MINUS }; diff --git a/src/server/game/Entities/Player/KillRewarder.cpp b/src/server/game/Entities/Player/KillRewarder.cpp index 382783540f..c3b26ee89f 100644 --- a/src/server/game/Entities/Player/KillRewarder.cpp +++ b/src/server/game/Entities/Player/KillRewarder.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "KillRewarder.h" #include "Formulas.h" #include "Group.h" #include "Pet.h" @@ -77,7 +78,7 @@ KillRewarder::KillRewarder(Player* killer, Unit* victim, bool isBattleGround) : _InitGroupData(); } -inline void KillRewarder::_InitGroupData() +void KillRewarder::_InitGroupData() { if (_group) { @@ -117,7 +118,7 @@ inline void KillRewarder::_InitGroupData() _count = 1; } -inline void KillRewarder::_InitXP(Player* player) +void KillRewarder::_InitXP(Player* player) { // Get initial value of XP for kill. // XP is given: @@ -134,14 +135,14 @@ inline void KillRewarder::_InitXP(Player* player) _xp = uint32(_xp * ct->ModHealth); } -inline void KillRewarder::_RewardHonor(Player* player) +void KillRewarder::_RewardHonor(Player* player) { // Rewarded player must be alive. if (player->IsAlive()) player->RewardHonor(_victim, _count, -1); } -inline void KillRewarder::_RewardXP(Player* player, float rate) +void KillRewarder::_RewardXP(Player* player, float rate) { uint32 xp(_xp); if (_group) @@ -172,14 +173,14 @@ inline void KillRewarder::_RewardXP(Player* player, float rate) } } -inline void KillRewarder::_RewardReputation(Player* player, float rate) +void KillRewarder::_RewardReputation(Player* player, float rate) { // 4.3. Give reputation (player must not be on BG). // Even dead players and corpses are rewarded. player->RewardReputation(_victim, rate); } -inline void KillRewarder::_RewardKillCredit(Player* player) +void KillRewarder::_RewardKillCredit(Player* player) { // 4.4. Give kill credit (player must not be in group, or he must be alive or without corpse). if (!_group || player->IsAlive() || !player->GetCorpse()) diff --git a/src/server/game/Entities/Player/KillRewarder.h b/src/server/game/Entities/Player/KillRewarder.h index a835753bdf..ab6a3a635f 100644 --- a/src/server/game/Entities/Player/KillRewarder.h +++ b/src/server/game/Entities/Player/KillRewarder.h @@ -15,7 +15,16 @@ * with this program. If not, see . */ -class KillRewarder +#ifndef __KILL_REWARDER_H__ +#define __KILL_REWARDER_H__ + +#include "Define.h" + +class Group; +class Player; +class Unit; + +class AC_GAME_API KillRewarder { public: KillRewarder(Player* killer, Unit* victim, bool isBattleGround); @@ -47,3 +56,5 @@ private: bool _isBattleGround; bool _isPvP; }; + +#endif diff --git a/src/server/game/Entities/Player/PlayerGossip.cpp b/src/server/game/Entities/Player/PlayerGossip.cpp index 4db9352211..99504f2539 100644 --- a/src/server/game/Entities/Player/PlayerGossip.cpp +++ b/src/server/game/Entities/Player/PlayerGossip.cpp @@ -16,10 +16,13 @@ */ #include "BattlegroundMgr.h" +#include "GossipDef.h" #include "Language.h" +#include "ObjectMgr.h" #include "OutdoorPvPMgr.h" #include "Pet.h" #include "Player.h" +#include "WorldSession.h" /*********************************************************/ /*** GOSSIP SYSTEM ***/ diff --git a/src/server/game/Entities/Player/PlayerMisc.cpp b/src/server/game/Entities/Player/PlayerMisc.cpp index c14ff97fc2..2b153b2c78 100644 --- a/src/server/game/Entities/Player/PlayerMisc.cpp +++ b/src/server/game/Entities/Player/PlayerMisc.cpp @@ -15,9 +15,11 @@ * with this program. If not, see . */ +#include "AccountMgr.h" #include "MapMgr.h" #include "Player.h" #include "ScriptMgr.h" +#include "WorldSession.h" /*********************************************************/ /*** FLOOD FILTER SYSTEM ***/ diff --git a/src/server/game/Entities/Player/PlayerQuest.cpp b/src/server/game/Entities/Player/PlayerQuest.cpp index 06be32c20a..840b334d3d 100644 --- a/src/server/game/Entities/Player/PlayerQuest.cpp +++ b/src/server/game/Entities/Player/PlayerQuest.cpp @@ -18,14 +18,17 @@ #include "CreatureAI.h" #include "DisableMgr.h" #include "GameObjectAI.h" +#include "GitRevision.h" +#include "GossipDef.h" #include "Group.h" #include "MapMgr.h" #include "Player.h" #include "PoolMgr.h" #include "ReputationMgr.h" -#include "GitRevision.h" #include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellMgr.h" +#include "WorldSession.h" #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/server/game/Entities/Player/PlayerStorage.cpp b/src/server/game/Entities/Player/PlayerStorage.cpp index 1451b696c3..bee02a6141 100644 --- a/src/server/game/Entities/Player/PlayerStorage.cpp +++ b/src/server/game/Entities/Player/PlayerStorage.cpp @@ -28,9 +28,9 @@ #include "Channel.h" #include "CharacterDatabaseCleaner.h" #include "Chat.h" -#include "Config.h" #include "Common.h" #include "ConditionMgr.h" +#include "Config.h" #include "CreatureAI.h" #include "DatabaseEnv.h" #include "DisableMgr.h" @@ -43,8 +43,8 @@ #include "Guild.h" #include "InstanceSaveMgr.h" #include "InstanceScript.h" -#include "Language.h" #include "LFGMgr.h" +#include "Language.h" #include "Log.h" #include "LootItemStorage.h" #include "MapMgr.h" @@ -55,8 +55,8 @@ #include "OutdoorPvPMgr.h" #include "Pet.h" #include "Player.h" -#include "QuestDef.h" #include "QueryHolder.h" +#include "QuestDef.h" #include "ReputationMgr.h" #include "SavingSystem.h" #include "ScriptMgr.h" @@ -74,6 +74,7 @@ #include "WeatherMgr.h" #include "World.h" #include "WorldPacket.h" +#include "WorldSession.h" #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/server/game/Entities/Player/PlayerTaxi.cpp b/src/server/game/Entities/Player/PlayerTaxi.cpp index ae32ac6903..ac1cb461c1 100644 --- a/src/server/game/Entities/Player/PlayerTaxi.cpp +++ b/src/server/game/Entities/Player/PlayerTaxi.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "ObjectMgr.h" #include "Player.h" PlayerTaxi::PlayerTaxi() : _taxiSegment(0) diff --git a/src/server/game/Entities/Player/PlayerTaxi.h b/src/server/game/Entities/Player/PlayerTaxi.h index d319421cc6..fc47874ff5 100644 --- a/src/server/game/Entities/Player/PlayerTaxi.h +++ b/src/server/game/Entities/Player/PlayerTaxi.h @@ -15,11 +15,20 @@ * with this program. If not, see . */ -class PlayerTaxi +#ifndef __PLAYER_TAXI_H__ +#define __PLAYER_TAXI_H__ + +#include "DBCStructure.h" +#include + +class ByteBuffer; + +class AC_GAME_API PlayerTaxi { public: PlayerTaxi(); ~PlayerTaxi() = default; + // Nodes void InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level); void LoadTaxiMask(std::string const& data); @@ -30,6 +39,7 @@ public: uint32 submask = 1 << ((nodeidx - 1) % 32); return (m_taximask[field] & submask) == submask; } + bool SetTaximaskNode(uint32 nodeidx) { uint8 field = uint8((nodeidx - 1) / 32); @@ -42,6 +52,7 @@ public: else return false; } + void AppendTaximaskTo(ByteBuffer& data, bool all); // Destinations @@ -72,3 +83,5 @@ private: std::vector m_TaxiDestinations; uint32 _taxiSegment; }; + +#endif diff --git a/src/server/game/Entities/Player/PlayerUpdates.cpp b/src/server/game/Entities/Player/PlayerUpdates.cpp index e5511d932b..ae2a0f8ce8 100644 --- a/src/server/game/Entities/Player/PlayerUpdates.cpp +++ b/src/server/game/Entities/Player/PlayerUpdates.cpp @@ -33,6 +33,7 @@ #include "ScriptMgr.h" #include "SkillDiscovery.h" #include "SpellAuraEffects.h" +#include "SpellMgr.h" #include "UpdateFieldFlags.h" #include "Vehicle.h" #include "WeatherMgr.h" @@ -797,8 +798,7 @@ bool Player::UpdateCraftSkill(uint32 spellid) { LOG_DEBUG("entities.player.skills", "UpdateCraftSkill spellid %d", spellid); - SkillLineAbilityMapBounds bounds = - sSpellMgr->GetSkillLineAbilityMapBounds(spellid); + SkillLineAbilityMapBounds bounds = sSpellMgr->GetSkillLineAbilityMapBounds(spellid); for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx) diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp index 3352e1e40b..5c09c7fa77 100644 --- a/src/server/game/Entities/Player/SocialMgr.cpp +++ b/src/server/game/Entities/Player/SocialMgr.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "SocialMgr.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" diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h index 503078d1d1..cf495705d4 100644 --- a/src/server/game/Entities/Player/SocialMgr.h +++ b/src/server/game/Entities/Player/SocialMgr.h @@ -20,6 +20,7 @@ #include "Common.h" #include "DatabaseEnv.h" +#include "ObjectGuid.h" #include class Player; diff --git a/src/server/game/Entities/Player/TradeData.cpp b/src/server/game/Entities/Player/TradeData.cpp index d2698d8863..363e338e6f 100644 --- a/src/server/game/Entities/Player/TradeData.cpp +++ b/src/server/game/Entities/Player/TradeData.cpp @@ -16,6 +16,7 @@ */ #include "Player.h" +#include "WorldSession.h" TradeData* TradeData::GetTraderData() const { diff --git a/src/server/game/Entities/Player/TradeData.h b/src/server/game/Entities/Player/TradeData.h index 266cd33fb4..997726140f 100644 --- a/src/server/game/Entities/Player/TradeData.h +++ b/src/server/game/Entities/Player/TradeData.h @@ -15,6 +15,15 @@ * with this program. If not, see . */ +#ifndef __TRADE_DATA_H__ +#define __TRADE_DATA_H__ + +#include "Define.h" + +class Item; +class ObjectGuid; +class Player; + enum TradeSlots { TRADE_SLOT_COUNT = 7, @@ -23,12 +32,11 @@ enum TradeSlots TRADE_SLOT_INVALID = -1, }; -class TradeData +class AC_GAME_API TradeData { public: // constructors - TradeData(Player* player, Player* trader) : m_player(player), m_trader(trader), m_accepted(false), m_acceptProccess(false), m_money(0), m_spell(0) - { - } + TradeData(Player* player, Player* trader) : + m_player(player), m_trader(trader), m_accepted(false), m_acceptProccess(false), m_money(0), m_spell(0) { } [[nodiscard]] Player* GetTrader() const { return m_trader; } [[nodiscard]] TradeData* GetTraderData() const; @@ -70,3 +78,5 @@ private: // fields ObjectGuid m_items[TRADE_SLOT_COUNT]; // traded itmes from m_player side including non-traded slot }; + +#endif diff --git a/src/server/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp index 4f37f628fb..691a059d6c 100644 --- a/src/server/game/Entities/Totem/Totem.cpp +++ b/src/server/game/Entities/Totem/Totem.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "Totem.h" #include "Group.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -22,7 +23,6 @@ #include "SpellAuraEffects.h" #include "SpellInfo.h" #include "SpellMgr.h" -#include "Totem.h" #include "WorldPacket.h" Totem::Totem(SummonPropertiesEntry const* properties, ObjectGuid owner) : Minion(properties, owner, false) diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 95ab73dd2a..ce4252761c 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "Transport.h" #include "Cell.h" #include "CellImpl.h" #include "Common.h" @@ -26,7 +27,6 @@ #include "Player.h" #include "ScriptMgr.h" #include "Spell.h" -#include "Transport.h" #include "Vehicle.h" #include "World.h" #include "WorldModel.h" diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6d4e2c310d..a299345190 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "Unit.h" #include "AccountMgr.h" #include "ArenaSpectator.h" #include "Battlefield.h" @@ -61,7 +62,6 @@ #include "Totem.h" #include "TotemAI.h" #include "Transport.h" -#include "Unit.h" #include "UpdateFieldFlags.h" #include "Util.h" #include "Vehicle.h" @@ -71,8 +71,8 @@ #include #ifdef ELUNA -#include "LuaEngine.h" #include "ElunaEventMgr.h" +#include "LuaEngine.h" #endif float baseMoveSpeed[MAX_MOVE_TYPE] = diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index b820dd4558..b8cca93805 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -19,8 +19,8 @@ #define __UNIT_H #include "EventProcessor.h" -#include "FollowerReference.h" #include "FollowerRefMgr.h" +#include "FollowerReference.h" #include "HostileRefMgr.h" #include "MotionMaster.h" #include "Object.h" diff --git a/src/server/game/Entities/Unit/enuminfo_Unit.cpp b/src/server/game/Entities/Unit/enuminfo_Unit.cpp index 8444ba3d49..1e72b7187c 100644 --- a/src/server/game/Entities/Unit/enuminfo_Unit.cpp +++ b/src/server/game/Entities/Unit/enuminfo_Unit.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "Unit.h" #include "Define.h" #include "SmartEnum.h" +#include "Unit.h" #include namespace Acore::Impl::EnumUtilsImpl diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index d4bf269838..7af38fdb80 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "Vehicle.h" #include "BattlefieldWG.h" #include "Common.h" #include "CreatureAI.h" @@ -27,7 +28,6 @@ #include "TemporarySummon.h" #include "Unit.h" #include "Util.h" -#include "Vehicle.h" #include "WorldPacket.h" Vehicle::Vehicle(Unit* unit, VehicleEntry const* vehInfo, uint32 creatureEntry) : diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 4b6bb0c69f..11254ccd6b 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "GameEventMgr.h" #include "BattlegroundMgr.h" #include "DisableMgr.h" -#include "GameEventMgr.h" #include "GameObjectAI.h" #include "GossipDef.h" #include "Language.h" diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index 3d22c0d315..3eebae4d89 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "ObjectAccessor.h" #include "Corpse.h" #include "Creature.h" #include "DynamicObject.h" @@ -25,7 +26,6 @@ #include "Map.h" #include "MapInstanced.h" #include "MapMgr.h" -#include "ObjectAccessor.h" #include "ObjectDefines.h" #include "ObjectMgr.h" #include "Opcodes.h" diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 3400726070..1c7243135a 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "ObjectMgr.h" #include "AccountMgr.h" #include "AchievementMgr.h" #include "ArenaTeamMgr.h" @@ -27,11 +28,10 @@ #include "GossipDef.h" #include "GroupMgr.h" #include "GuildMgr.h" -#include "Language.h" #include "LFGMgr.h" +#include "Language.h" #include "Log.h" #include "MapMgr.h" -#include "ObjectMgr.h" #include "Pet.h" #include "PoolMgr.h" #include "ReputationMgr.h" diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h index 981a8aae6f..fe3124aa56 100644 --- a/src/server/game/Grids/GridDefines.h +++ b/src/server/game/Grids/GridDefines.h @@ -19,8 +19,8 @@ #define ACORE_GRIDDEFINES_H #include "Common.h" -#include "NGrid.h" #include "MapDefines.h" +#include "NGrid.h" #include // Forward class definitions diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp index 6e00993351..a85a7285a5 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp +++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp @@ -20,6 +20,7 @@ #include "Map.h" #include "ObjectAccessor.h" #include "SpellInfo.h" +#include "SpellMgr.h" #include "Transport.h" #include "UpdateData.h" #include "WorldPacket.h" diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index 8b8626ea24..4cb57cfdf5 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -21,11 +21,13 @@ #include "Corpse.h" #include "CreatureAI.h" #include "GridNotifiers.h" +#include "Object.h" #include "Opcodes.h" #include "Player.h" #include "SpellAuras.h" #include "UpdateData.h" #include "WorldPacket.h" +#include "WorldSession.h" template inline void Acore::VisibleNotifier::Visit(GridRefMgr& m) diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 15d53230d4..5533ea5596 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "ObjectGridLoader.h" #include "CellImpl.h" #include "Corpse.h" #include "Creature.h" @@ -22,7 +23,6 @@ #include "DynamicObject.h" #include "GameObject.h" #include "ObjectAccessor.h" -#include "ObjectGridLoader.h" #include "ObjectMgr.h" #include "Transport.h" #include "Vehicle.h" diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 80ca74ee78..87e8103e56 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "Group.h" #include "Battleground.h" #include "BattlegroundMgr.h" #include "DatabaseEnv.h" -#include "Group.h" #include "GroupMgr.h" #include "InstanceSaveMgr.h" #include "LFG.h" diff --git a/src/server/game/Groups/GroupMgr.cpp b/src/server/game/Groups/GroupMgr.cpp index 2b8c9e4537..b6b6fb6a65 100644 --- a/src/server/game/Groups/GroupMgr.cpp +++ b/src/server/game/Groups/GroupMgr.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "GroupMgr.h" #include "Common.h" #include "DBCStores.h" -#include "GroupMgr.h" -#include "Log.h" #include "InstanceSaveMgr.h" +#include "Log.h" #include "World.h" GroupMgr::GroupMgr() diff --git a/src/server/game/Groups/GroupReference.cpp b/src/server/game/Groups/GroupReference.cpp index 8c57263d55..3e12577aa5 100644 --- a/src/server/game/Groups/GroupReference.cpp +++ b/src/server/game/Groups/GroupReference.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "Group.h" #include "GroupReference.h" +#include "Group.h" void GroupReference::targetObjectBuildLink() { diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index f2352be026..72737afe03 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "Guild.h" #include "CalendarMgr.h" -#include "Chat.h" #include "CharacterCache.h" +#include "Chat.h" #include "Config.h" #include "DatabaseEnv.h" -#include "Guild.h" #include "GuildMgr.h" #include "Language.h" #include "Log.h" diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp index ecc521448d..24c7d204f4 100644 --- a/src/server/game/Guilds/GuildMgr.cpp +++ b/src/server/game/Guilds/GuildMgr.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "Common.h" #include "GuildMgr.h" +#include "Common.h" GuildMgr::GuildMgr() : NextGuildId(1) { } diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp index da01ff540d..df3920f21d 100644 --- a/src/server/game/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Handlers/AuctionHouseHandler.cpp @@ -22,8 +22,8 @@ #include "Log.h" #include "ObjectMgr.h" #include "Opcodes.h" -#include "ScriptMgr.h" #include "Player.h" +#include "ScriptMgr.h" #include "UpdateMask.h" #include "Util.h" #include "World.h" diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index 975c9e2162..3c4990540f 100644 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -45,8 +45,8 @@ Copied events should probably have a new owner #include "Opcodes.h" #include "Player.h" #include "SocialMgr.h" -#include "utf8.h" #include "WorldSession.h" +#include "utf8.h" void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recvData*/) { diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index d15d625c83..29345c5336 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -28,6 +28,7 @@ #include "Group.h" #include "Guild.h" #include "GuildMgr.h" +#include "InstanceSaveMgr.h" #include "Language.h" #include "Log.h" #include "Metric.h" diff --git a/src/server/game/Handlers/DuelHandler.cpp b/src/server/game/Handlers/DuelHandler.cpp index e034f6c0ea..14f9afd747 100644 --- a/src/server/game/Handlers/DuelHandler.cpp +++ b/src/server/game/Handlers/DuelHandler.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "Log.h" #include "Opcodes.h" #include "Player.h" #include "UpdateData.h" diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index a2f6c003cb..fa80baff3e 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -24,6 +24,7 @@ #include "Player.h" #include "ScriptMgr.h" #include "SpellInfo.h" +#include "SpellMgr.h" #include "UpdateData.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index f3ba761b6a..a1e51c86b3 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -17,8 +17,8 @@ #include "AccountMgr.h" #include "CharacterCache.h" -#include "DatabaseEnv.h" #include "DBCStores.h" +#include "DatabaseEnv.h" #include "Item.h" #include "Language.h" #include "Log.h" diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 0b66552ea4..b1a5fd732e 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -24,8 +24,8 @@ #include "GameGraveyard.h" #include "InstanceSaveMgr.h" #include "Log.h" -#include "MathUtil.h" #include "MapMgr.h" +#include "MathUtil.h" #include "ObjectMgr.h" #include "Opcodes.h" #include "Pet.h" @@ -33,10 +33,10 @@ #include "ScriptMgr.h" #include "SpellAuras.h" #include "Transport.h" +#include "Vehicle.h" #include "WaypointMovementGenerator.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "Vehicle.h" #define MOVEMENT_PACKET_TIME_DELAY 0 diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 0dc3b262b8..57a3b3fbe1 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -26,6 +26,7 @@ #include "Opcodes.h" #include "Pet.h" #include "Player.h" +#include "QueryHolder.h" #include "Spell.h" #include "SpellInfo.h" #include "SpellMgr.h" @@ -33,7 +34,6 @@ #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "QueryHolder.h" class LoadPetFromDBQueryHolder : public CharacterDatabaseQueryHolder { diff --git a/src/server/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp index c55cc0e87e..86d2d1fae0 100644 --- a/src/server/game/Handlers/SkillHandler.cpp +++ b/src/server/game/Handlers/SkillHandler.cpp @@ -15,10 +15,12 @@ * with this program. If not, see . */ +#include "Log.h" #include "ObjectAccessor.h" #include "Opcodes.h" #include "Pet.h" #include "Player.h" +#include "SpellMgr.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index 41074f7f00..3011605e2e 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -24,6 +24,7 @@ #include "ScriptMgr.h" #include "SocialMgr.h" #include "Spell.h" +#include "SpellMgr.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index 1226c5bfb3..de35e2467d 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "InstanceSaveMgr.h" #include "Common.h" #include "Config.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "Group.h" -#include "InstanceSaveMgr.h" #include "InstanceScript.h" #include "Log.h" #include "Map.h" diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index b070f5a00d..a59644d036 100644 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -18,8 +18,8 @@ #ifndef _INSTANCESAVEMGR_H #define _INSTANCESAVEMGR_H -#include "DatabaseEnv.h" #include "DBCEnums.h" +#include "DatabaseEnv.h" #include "Define.h" #include "ObjectDefines.h" #include "ObjectGuid.h" diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index cc5e19e3eb..8631fb3c0a 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -15,12 +15,13 @@ * with this program. If not, see . */ +#include "InstanceScript.h" #include "Creature.h" #include "CreatureAI.h" #include "DatabaseEnv.h" #include "GameObject.h" #include "Group.h" -#include "InstanceScript.h" +#include "InstanceSaveMgr.h" #include "LFGMgr.h" #include "Log.h" #include "Map.h" @@ -28,6 +29,7 @@ #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 07e12b4c03..47f677d90e 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -18,8 +18,6 @@ #ifndef ACORE_INSTANCE_DATA_H #define ACORE_INSTANCE_DATA_H -//#include "GameObject.h" -//#include "Map.h" #include "ObjectMgr.h" #include "World.h" #include "ZoneScript.h" diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index a8bcabfecd..acec634136 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "LootMgr.h" #include "Containers.h" #include "Group.h" #include "Log.h" -#include "LootMgr.h" #include "ObjectMgr.h" #include "Player.h" #include "ScriptMgr.h" diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index 7ad3c832f0..1d5cdb9a09 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -15,19 +15,20 @@ * with this program. If not, see . */ +#include "Mail.h" #include "AuctionHouseMgr.h" #include "BattlegroundMgr.h" -#include "CharacterCache.h" #include "CalendarMgr.h" +#include "CharacterCache.h" #include "DatabaseEnv.h" #include "Item.h" #include "Log.h" -#include "Mail.h" #include "ObjectMgr.h" #include "Player.h" #include "ScriptMgr.h" #include "Unit.h" #include "World.h" +#include "WorldSession.h" MailSender::MailSender(Object* sender, MailStationery stationery) : m_stationery(stationery) { diff --git a/src/server/game/Mails/Mail.h b/src/server/game/Mails/Mail.h index 179f50a926..f73dffb5f3 100644 --- a/src/server/game/Mails/Mail.h +++ b/src/server/game/Mails/Mail.h @@ -19,6 +19,8 @@ #define ACORE_MAIL_H #include "Common.h" +#include "DatabaseEnvFwd.h" +#include "ObjectGuid.h" #include #include diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 06d36e9a30..46c4307bcf 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "Map.h" #include "Battleground.h" #include "CellImpl.h" #include "Chat.h" @@ -26,18 +27,18 @@ #include "Group.h" #include "InstanceScript.h" #include "LFGMgr.h" -#include "Map.h" #include "MapInstanced.h" #include "Metric.h" #include "Object.h" #include "ObjectAccessor.h" +#include "ObjectGridLoader.h" #include "ObjectMgr.h" #include "Pet.h" #include "ScriptMgr.h" #include "Transport.h" -#include "Vehicle.h" #include "VMapFactory.h" #include "VMapMgr2.h" +#include "Vehicle.h" #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index b0977dc61c..c674004f06 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -19,8 +19,8 @@ #define ACORE_MAP_H #include "Cell.h" -#include "DataMap.h" #include "DBCStructure.h" +#include "DataMap.h" #include "Define.h" #include "DynamicTree.h" #include "GameObjectModel.h" @@ -59,6 +59,7 @@ class Transport; class StaticTransport; class MotionTransport; class PathGenerator; + namespace Acore { struct ObjectUpdater; @@ -440,6 +441,7 @@ public: [[nodiscard]] bool IsBattleground() const { return i_mapEntry && i_mapEntry->IsBattleground(); } [[nodiscard]] bool IsBattleArena() const { return i_mapEntry && i_mapEntry->IsBattleArena(); } [[nodiscard]] bool IsBattlegroundOrArena() const { return i_mapEntry && i_mapEntry->IsBattlegroundOrArena(); } + bool GetEntrancePos(int32& mapid, float& x, float& y) { if (!i_mapEntry) diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp index f812c9d0d7..5fe2169cd8 100644 --- a/src/server/game/Maps/MapInstanced.cpp +++ b/src/server/game/Maps/MapInstanced.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "MapInstanced.h" #include "Battleground.h" #include "Group.h" #include "InstanceSaveMgr.h" -#include "MapInstanced.h" -#include "MapMgr.h" #include "MMapFactory.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Player.h" #include "VMapFactory.h" diff --git a/src/server/game/Maps/MapMgr.cpp b/src/server/game/Maps/MapMgr.cpp index 40e571d29c..39f4b55dc4 100644 --- a/src/server/game/Maps/MapMgr.cpp +++ b/src/server/game/Maps/MapMgr.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "MapMgr.h" #include "AvgDiffTracker.h" #include "Chat.h" #include "DatabaseEnv.h" @@ -22,16 +23,15 @@ #include "Group.h" #include "InstanceSaveMgr.h" #include "InstanceScript.h" -#include "Language.h" #include "LFGMgr.h" +#include "Language.h" #include "Log.h" #include "MapInstanced.h" -#include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" -#include "ScriptMgr.h" #include "Player.h" +#include "ScriptMgr.h" #include "Transport.h" #include "World.h" #include "WorldPacket.h" diff --git a/src/server/game/Maps/MapMgr.h b/src/server/game/Maps/MapMgr.h index 1284899e09..c17cfd5917 100644 --- a/src/server/game/Maps/MapMgr.h +++ b/src/server/game/Maps/MapMgr.h @@ -21,9 +21,9 @@ #include "Common.h" #include "Define.h" #include "Map.h" +#include "MapInstanced.h" #include "MapUpdater.h" #include "Object.h" -#include "MapInstanced.h" #include diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp index 75e6bc9964..6f4b9d62f5 100644 --- a/src/server/game/Maps/MapUpdater.cpp +++ b/src/server/game/Maps/MapUpdater.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "MapUpdater.h" #include "AvgDiffTracker.h" #include "LFGMgr.h" #include "Map.h" -#include "MapUpdater.h" #include "Metric.h" class UpdateRequest diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp index 972f096769..2818ef35c2 100644 --- a/src/server/game/Maps/TransportMgr.cpp +++ b/src/server/game/Maps/TransportMgr.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "TransportMgr.h" #include "InstanceScript.h" #include "MapMgr.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 7aa761ce4d..9767ab3359 100644 --- a/src/server/game/Maps/TransportMgr.h +++ b/src/server/game/Maps/TransportMgr.h @@ -19,6 +19,7 @@ #define TRANSPORTMGR_H #include "DBCStores.h" +#include "ObjectGuid.h" #include "Spline.h" #include diff --git a/src/server/game/Misc/AsyncAuctionListing.cpp b/src/server/game/Misc/AsyncAuctionListing.cpp index d52908e1e7..e40de57ad9 100644 --- a/src/server/game/Misc/AsyncAuctionListing.cpp +++ b/src/server/game/Misc/AsyncAuctionListing.cpp @@ -21,6 +21,7 @@ #include "Opcodes.h" #include "Player.h" #include "SpellAuraEffects.h" +#include "WorldSession.h" uint32 AsyncAuctionListingMgr::auctionListingDiff = 0; bool AsyncAuctionListingMgr::auctionListingAllowed = false; diff --git a/src/server/game/Misc/BanMgr.cpp b/src/server/game/Misc/BanMgr.cpp index 775587d0bb..90f0c4539c 100644 --- a/src/server/game/Misc/BanMgr.cpp +++ b/src/server/game/Misc/BanMgr.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "AccountMgr.h" #include "BanMgr.h" +#include "AccountMgr.h" #include "DatabaseEnv.h" #include "Language.h" #include "ObjectAccessor.h" diff --git a/src/server/game/Misc/GameGraveyard.cpp b/src/server/game/Misc/GameGraveyard.cpp index 1cca11a8db..4cb799ed55 100644 --- a/src/server/game/Misc/GameGraveyard.cpp +++ b/src/server/game/Misc/GameGraveyard.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "DatabaseEnv.h" -#include "DBCStores.h" #include "GameGraveyard.h" +#include "DBCStores.h" +#include "DatabaseEnv.h" #include "Log.h" #include "MapMgr.h" diff --git a/src/server/game/Miscellaneous/Formulas.cpp b/src/server/game/Miscellaneous/Formulas.cpp index 37110348ce..779bae46af 100644 --- a/src/server/game/Miscellaneous/Formulas.cpp +++ b/src/server/game/Miscellaneous/Formulas.cpp @@ -16,8 +16,8 @@ */ #include "Formulas.h" -#include "Log.h" #include "Creature.h" +#include "Log.h" #include "Player.h" #include "World.h" diff --git a/src/server/game/Motd/ServerMotd.cpp b/src/server/game/Motd/ServerMotd.cpp index 04e194bb42..2ae805a603 100644 --- a/src/server/game/Motd/ServerMotd.cpp +++ b/src/server/game/Motd/ServerMotd.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "ServerMotd.h" #include "Common.h" #include "Opcodes.h" #include "ScriptMgr.h" -#include "ServerMotd.h" #include "Util.h" #include "WorldPacket.h" #include diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index a13365348f..a53f4afdf1 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "MotionMaster.h" #include "ConfusedMovementGenerator.h" #include "Creature.h" #include "CreatureAISelector.h" @@ -22,7 +23,7 @@ #include "FleeingMovementGenerator.h" #include "HomeMovementGenerator.h" #include "IdleMovementGenerator.h" -#include "MotionMaster.h" +#include "Log.h" #include "MoveSpline.h" #include "MoveSplineInit.h" #include "PointMovementGenerator.h" diff --git a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp index 42d48857e4..a453b7e4ed 100644 --- a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "EscortMovementGenerator.h" #include "Creature.h" #include "CreatureAI.h" #include "Errors.h" -#include "EscortMovementGenerator.h" #include "MoveSpline.h" #include "MoveSplineInit.h" #include "Player.h" diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index 9175c31334..b3aa71b969 100644 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "FleeingMovementGenerator.h" #include "Creature.h" #include "CreatureAI.h" -#include "FleeingMovementGenerator.h" #include "MapMgr.h" #include "MoveSplineInit.h" #include "ObjectAccessor.h" diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp index 6638fa961e..da3058c769 100644 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "IdleMovementGenerator.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 a465d96585..c8702d8b4d 100644 --- a/src/server/game/Movement/MovementGenerators/PathGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp @@ -15,15 +15,15 @@ * with this program. If not, see . */ +#include "PathGenerator.h" #include "Creature.h" #include "DetourCommon.h" #include "Geometry.h" #include "Log.h" -#include "Map.h" -#include "Metric.h" #include "MMapFactory.h" #include "MMapMgr.h" -#include "PathGenerator.h" +#include "Map.h" +#include "Metric.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 47849cacef..e5970be371 100644 --- a/src/server/game/Movement/MovementGenerators/PathGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PathGenerator.h @@ -20,9 +20,9 @@ #include "DetourNavMesh.h" #include "DetourNavMeshQuery.h" -#include "MapDefines.h" #include "MMapFactory.h" #include "MMapMgr.h" +#include "MapDefines.h" #include "MoveSplineInitArgs.h" #include "SharedDefines.h" #include diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp index 982f2c34a8..c2db609423 100644 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp @@ -15,13 +15,14 @@ * with this program. If not, see . */ +#include "PointMovementGenerator.h" #include "Creature.h" #include "CreatureAI.h" #include "Errors.h" #include "MoveSpline.h" #include "MoveSplineInit.h" +#include "ObjectAccessor.h" #include "Player.h" -#include "PointMovementGenerator.h" #include "World.h" //----- Point Movement Generator diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index 8f4b300a16..e788789dff 100644 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "RandomMovementGenerator.h" #include "Creature.h" #include "CreatureGroups.h" #include "Map.h" @@ -22,7 +23,6 @@ #include "MoveSpline.h" #include "MoveSplineInit.h" #include "ObjectAccessor.h" -#include "RandomMovementGenerator.h" #include "Spell.h" #include "Util.h" diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index 2023115285..ac0d69d950 100644 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ +#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" static bool IsMutualChase(Unit* owner, Unit* target) diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index 2412bb0c2c..67b8c27524 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "WaypointMovementGenerator.h" #include "Creature.h" #include "CreatureAI.h" #include "CreatureGroups.h" @@ -25,7 +26,6 @@ #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/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index 7158ee54d4..840f0497dd 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "MoveSpline.h" #include "Creature.h" #include "Log.h" -#include "MoveSpline.h" #include namespace Movement diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index d73c097bcb..95ac5b010b 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "MovementPacketBuilder.h" -#include "MoveSpline.h" #include "MoveSplineInit.h" +#include "MoveSpline.h" +#include "MovementPacketBuilder.h" #include "Opcodes.h" #include "Transport.h" #include "Unit.h" diff --git a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp index 852543c133..a624b0766f 100644 --- a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp +++ b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ByteBuffer.h" #include "MovementPacketBuilder.h" +#include "ByteBuffer.h" #include "MoveSpline.h" namespace Movement diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index 0de811038e..36f127447b 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -18,8 +18,8 @@ #ifndef TRINITYSERVER_SPLINE_H #define TRINITYSERVER_SPLINE_H -#include "MovementTypedefs.h" #include "Errors.h" +#include "MovementTypedefs.h" #include #include diff --git a/src/server/game/Movement/Waypoints/WaypointMgr.cpp b/src/server/game/Movement/Waypoints/WaypointMgr.cpp index 78753d3abc..362257b360 100644 --- a/src/server/game/Movement/Waypoints/WaypointMgr.cpp +++ b/src/server/game/Movement/Waypoints/WaypointMgr.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "WaypointMgr.h" #include "DatabaseEnv.h" #include "GridDefines.h" #include "Log.h" -#include "WaypointMgr.h" WaypointMgr::WaypointMgr() { diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index 424d334cfe..df0cdc4a98 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "OutdoorPvP.h" #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" @@ -23,7 +24,6 @@ #include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" -#include "OutdoorPvP.h" #include "OutdoorPvPMgr.h" #include "WorldPacket.h" diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp index 36c7c64b2d..f637d8e150 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "OutdoorPvPMgr.h" #include "DisableMgr.h" #include "ObjectMgr.h" -#include "OutdoorPvPMgr.h" #include "Player.h" #include "ScriptMgr.h" diff --git a/src/server/game/Petitions/PetitionMgr.cpp b/src/server/game/Petitions/PetitionMgr.cpp index e38a9021ea..22bc4433f8 100644 --- a/src/server/game/Petitions/PetitionMgr.cpp +++ b/src/server/game/Petitions/PetitionMgr.cpp @@ -15,9 +15,10 @@ * with this program. If not, see . */ +#include "PetitionMgr.h" #include "DatabaseEnv.h" #include "Log.h" -#include "PetitionMgr.h" +#include "ObjectAccessor.h" #include "Player.h" #include "QueryResult.h" #include "Timer.h" diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 3790b8f279..56f1f2175a 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "PoolMgr.h" #include "Containers.h" #include "Log.h" #include "MapMgr.h" #include "ObjectMgr.h" -#include "PoolMgr.h" #include "Transport.h" //////////////////////////////////////////////////////////// diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index efd966eef1..23025d9c83 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "QuestDef.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 6b42415dcb..82842d620a 100644 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -18,8 +18,8 @@ #ifndef AZEROTHCORE_QUEST_H #define AZEROTHCORE_QUEST_H -#include "DatabaseEnv.h" #include "DBCEnums.h" +#include "DatabaseEnv.h" #include "Define.h" #include "SharedDefines.h" #include "WorldPacket.h" @@ -107,7 +107,7 @@ enum QuestStatus : uint8 MAX_QUEST_STATUS }; -enum QuestGiverStatus +enum QuestGiverStatus : uint32 { DIALOG_STATUS_NONE = 0, DIALOG_STATUS_UNAVAILABLE = 1, diff --git a/src/server/game/Quests/enuminfo_QuestDef.cpp b/src/server/game/Quests/enuminfo_QuestDef.cpp index aec7b5de36..cf4651adcb 100644 --- a/src/server/game/Quests/enuminfo_QuestDef.cpp +++ b/src/server/game/Quests/enuminfo_QuestDef.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "QuestDef.h" #include "Define.h" +#include "QuestDef.h" #include "SmartEnum.h" #include diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp index 4eafa92656..5e8be476ea 100644 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "DatabaseEnv.h" +#include "ReputationMgr.h" #include "DBCStores.h" +#include "DatabaseEnv.h" #include "ObjectMgr.h" #include "Player.h" -#include "ReputationMgr.h" #include "ScriptMgr.h" #include "World.h" #include "WorldPacket.h" diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index 27afdcf942..f755e3cb08 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -23,8 +23,8 @@ #include "MapRefMgr.h" #include "ObjectMgr.h" #include "Pet.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Transport.h" #include "WaypointMgr.h" #include "World.h" diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index cd4bc46d29..1ff0d7c3fe 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -15,24 +15,24 @@ * with this program. If not, see . */ +#include "ScriptMgr.h" #include "Chat.h" #include "Config.h" #include "CreatureAI.h" -#include "DatabaseEnv.h" #include "DBCStores.h" +#include "DatabaseEnv.h" #include "GossipDef.h" #include "InstanceScript.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" #include "Player.h" -#include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "ScriptSystem.h" +#include "ScriptedGossip.h" +#include "SmartAI.h" #include "SpellInfo.h" #include "SpellScript.h" #include "Transport.h" #include "Vehicle.h" -#include "SmartAI.h" #include "WorldPacket.h" #ifdef ELUNA diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index 159190341f..af8b6eb2cc 100644 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "ScriptSystem.h" #include "DatabaseEnv.h" #include "ObjectMgr.h" #include "ScriptMgr.h" -#include "ScriptSystem.h" ScriptPointVector const SystemMgr::_empty; diff --git a/src/server/game/Server/Packets/PacketUtilities.cpp b/src/server/game/Server/Packets/PacketUtilities.cpp index ba1753e47a..9e86d94387 100644 --- a/src/server/game/Server/Packets/PacketUtilities.cpp +++ b/src/server/game/Server/Packets/PacketUtilities.cpp @@ -16,10 +16,10 @@ */ #include "PacketUtilities.h" -#include "Hyperlinks.h" #include "Errors.h" -#include +#include "Hyperlinks.h" #include +#include WorldPackets::InvalidStringValueException::InvalidStringValueException(std::string const& value) : ByteBufferInvalidValueException("string", value.c_str()) { } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 4ab3b6419a..532b10c66c 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -18,9 +18,9 @@ #include "Opcodes.h" #include "Log.h" #include "WorldSession.h" -//#include "Packets/AllPackets.h" #include #include +//#include "Packets/AllPackets.h" template class PacketHandler : public ClientOpcodeHandler diff --git a/src/server/game/Server/WorldPacket.h b/src/server/game/Server/WorldPacket.h index d88e7090d8..c651cf4af8 100644 --- a/src/server/game/Server/WorldPacket.h +++ b/src/server/game/Server/WorldPacket.h @@ -18,10 +18,10 @@ #ifndef _WORLDPACKET_H_ #define _WORLDPACKET_H_ -#include "Common.h" -#include "Opcodes.h" #include "ByteBuffer.h" +#include "Common.h" #include "Duration.h" +#include "Opcodes.h" class WorldPacket : public ByteBuffer { diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index afac897588..1b3250a012 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -23,8 +23,8 @@ #define __WORLDSESSION_H #include "AccountMgr.h" -#include "AuthDefines.h" #include "AddonMgr.h" +#include "AuthDefines.h" #include "BanMgr.h" #include "CircularBuffer.h" #include "Common.h" @@ -33,8 +33,8 @@ #include "Packet.h" #include "SharedDefines.h" #include "World.h" -#include #include +#include class Creature; class GameObject; diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index d1fdbba561..dbad55fb5b 100644 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -18,14 +18,14 @@ #ifndef __WORLDSOCKET_H__ #define __WORLDSOCKET_H__ -#include "Common.h" #include "AuthCrypt.h" +#include "Common.h" +#include "MPSCQueue.h" #include "ServerPktHeader.h" #include "Socket.h" #include "Util.h" #include "WorldPacket.h" #include "WorldSession.h" -#include "MPSCQueue.h" #include using boost::asio::ip::tcp; diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index 3ea3e53246..75eb730bd7 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "WorldSocketMgr.h" #include "Config.h" #include "NetworkThread.h" #include "ScriptMgr.h" #include "WorldSocket.h" -#include "WorldSocketMgr.h" #include class WorldSocketThread : public NetworkThread diff --git a/src/server/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp index d351cb5503..9f1762996d 100644 --- a/src/server/game/Skills/SkillDiscovery.cpp +++ b/src/server/game/Skills/SkillDiscovery.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "SkillDiscovery.h" #include "DatabaseEnv.h" #include "Log.h" #include "Player.h" -#include "SkillDiscovery.h" #include "SpellInfo.h" #include "SpellMgr.h" #include "Util.h" diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp index 510f02ba1f..237ac92668 100644 --- a/src/server/game/Skills/SkillExtraItems.cpp +++ b/src/server/game/Skills/SkillExtraItems.cpp @@ -15,11 +15,12 @@ * with this program. If not, see . */ +#include "SkillExtraItems.h" #include "DatabaseEnv.h" #include "Log.h" #include "ObjectMgr.h" #include "Player.h" -#include "SkillExtraItems.h" +#include "SpellMgr.h" #include // some type definitions diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index eab51874b1..3863df70df 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "SpellAuraEffects.h" #include "BattlefieldMgr.h" #include "Battleground.h" #include "CellImpl.h" @@ -33,7 +34,6 @@ #include "ReputationMgr.h" #include "ScriptMgr.h" #include "Spell.h" -#include "SpellAuraEffects.h" #include "SpellMgr.h" #include "Unit.h" #include "Util.h" diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 30117b472a..9f6859ce3d 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -16,10 +16,11 @@ */ #ifdef ELUNA -#include "LuaEngine.h" #include "ElunaUtility.h" +#include "LuaEngine.h" #endif +#include "Spell.h" #include "ArenaSpectator.h" #include "BattlefieldMgr.h" #include "Battleground.h" @@ -37,9 +38,9 @@ #include "InstanceScript.h" #include "Log.h" #include "LootMgr.h" -#include "MapMgr.h" #include "MMapFactory.h" #include "MMapMgr.h" +#include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -47,7 +48,6 @@ #include "Player.h" #include "ScriptMgr.h" #include "SharedDefines.h" -#include "Spell.h" #include "SpellAuraEffects.h" #include "SpellInfo.h" #include "SpellMgr.h" @@ -58,8 +58,8 @@ #include "UpdateData.h" #include "UpdateMask.h" #include "Util.h" -#include "Vehicle.h" #include "VMapFactory.h" +#include "Vehicle.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index a96d5c08d6..7ff4e40459 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -60,6 +60,7 @@ #include "Vehicle.h" #include "World.h" #include "WorldPacket.h" +#include "WorldSession.h" #ifdef ELUNA #include "LuaEngine.h" diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 4a1272d6ac..91416768e2 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "SpellInfo.h" #include "Battleground.h" #include "Chat.h" #include "ConditionMgr.h" @@ -24,7 +25,6 @@ #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/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 927f2728e7..303e55a5ea 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "SpellMgr.h" #include "BattlefieldMgr.h" #include "BattlefieldWG.h" #include "BattlegroundIC.h" @@ -31,7 +32,6 @@ #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 3242f74053..f427e14b2e 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "SpellScript.h" #include "Spell.h" #include "SpellAuras.h" #include "SpellMgr.h" -#include "SpellScript.h" #include bool _SpellScript::_Validate(SpellInfo const* entry) diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index 637f034c16..4f113cf01b 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "CreatureTextMgr.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" diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index 34276876c4..aa54ad798f 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -23,6 +23,7 @@ #include "ObjectAccessor.h" #include "Opcodes.h" #include "SharedDefines.h" +#include "WorldSession.h" enum CreatureTextRange { diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp index abbc45bc02..e25706da3f 100644 --- a/src/server/game/Tickets/TicketMgr.cpp +++ b/src/server/game/Tickets/TicketMgr.cpp @@ -15,6 +15,8 @@ * with this program. If not, see . */ +#include "TicketMgr.h" +#include "CharacterCache.h" #include "Chat.h" #include "Common.h" #include "DatabaseEnv.h" @@ -22,7 +24,6 @@ #include "Log.h" #include "Opcodes.h" #include "Player.h" -#include "TicketMgr.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Tickets/TicketMgr.h b/src/server/game/Tickets/TicketMgr.h index ed3916559c..3e1b2a9a1f 100644 --- a/src/server/game/Tickets/TicketMgr.h +++ b/src/server/game/Tickets/TicketMgr.h @@ -18,6 +18,7 @@ #ifndef _TICKETMGR_H #define _TICKETMGR_H +#include "CharacterCache.h" #include "ObjectMgr.h" #include diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index c84585a835..ee7a1cddb3 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -17,8 +17,8 @@ #include "CharacterDatabaseCleaner.h" #include "Common.h" -#include "Database/DatabaseEnv.h" #include "DBCStores.h" +#include "Database/DatabaseEnv.h" #include "Log.h" #include "SpellMgr.h" #include "World.h" diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index 4cecbd8170..c66061e9a1 100644 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "PlayerDump.h" #include "AccountMgr.h" -#include "Common.h" #include "CharacterCache.h" +#include "Common.h" #include "DatabaseEnv.h" #include "ObjectMgr.h" -#include "PlayerDump.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 98d2d292f2..0d085ab314 100644 --- a/src/server/game/Tools/PlayerDump.h +++ b/src/server/game/Tools/PlayerDump.h @@ -18,6 +18,7 @@ #ifndef _PLAYER_DUMP_H #define _PLAYER_DUMP_H +#include "Define.h" #include #include #include @@ -69,7 +70,7 @@ protected: class PlayerDumpWriter : public PlayerDump { public: - PlayerDumpWriter() {} + PlayerDumpWriter() { } bool GetDump(uint32 guid, std::string& dump); DumpReturn WriteDump(std::string const& file, uint32 guid); @@ -88,7 +89,7 @@ private: class PlayerDumpReader : public PlayerDump { public: - PlayerDumpReader() {} + PlayerDumpReader() { } DumpReturn LoadDump(std::string const& file, uint32 account, std::string name, uint32 guid); }; diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp index fe6364e3dd..57b977dcaa 100644 --- a/src/server/game/Warden/Warden.cpp +++ b/src/server/game/Warden/Warden.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "Warden.h" #include "AccountMgr.h" #include "BanMgr.h" #include "ByteBuffer.h" @@ -24,7 +25,6 @@ #include "Player.h" #include "SharedDefines.h" #include "Util.h" -#include "Warden.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp index b07d1baf67..75ecf6fc9e 100644 --- a/src/server/game/Warden/WardenCheckMgr.cpp +++ b/src/server/game/Warden/WardenCheckMgr.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "WardenCheckMgr.h" #include "Database/DatabaseEnv.h" #include "Log.h" #include "Util.h" #include "Warden.h" -#include "WardenCheckMgr.h" #include "WorldSession.h" WardenCheckMgr::WardenCheckMgr() diff --git a/src/server/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp index 2cde684fa6..09613b4f9a 100644 --- a/src/server/game/Warden/WardenMac.cpp +++ b/src/server/game/Warden/WardenMac.cpp @@ -15,12 +15,13 @@ * with this program. If not, see . */ +#include "WardenMac.h" #include "ByteBuffer.h" +#include "Log.h" #include "Opcodes.h" #include "Player.h" #include "SessionKeyGenerator.h" #include "Util.h" -#include "WardenMac.h" #include "WardenModuleMac.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Warden/WardenMac.h b/src/server/game/Warden/WardenMac.h index 6e0a5c4f1f..aad419897e 100644 --- a/src/server/game/Warden/WardenMac.h +++ b/src/server/game/Warden/WardenMac.h @@ -18,8 +18,8 @@ #ifndef _WARDEN_MAC_H #define _WARDEN_MAC_H -#include "ByteBuffer.h" #include "ARC4.h" +#include "ByteBuffer.h" #include "Warden.h" #include diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp index d85c587a89..a209c17efc 100644 --- a/src/server/game/Warden/WardenWin.cpp +++ b/src/server/game/Warden/WardenWin.cpp @@ -15,17 +15,18 @@ * with this program. If not, see . */ +#include "WardenWin.h" #include "ByteBuffer.h" #include "Common.h" #include "CryptoRandom.h" #include "HMAC.h" +#include "Log.h" #include "Opcodes.h" #include "Player.h" #include "SessionKeyGenerator.h" #include "Util.h" #include "WardenCheckMgr.h" #include "WardenModuleWin.h" -#include "WardenWin.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Warden/WardenWin.h b/src/server/game/Warden/WardenWin.h index d06d863644..a079fa56b3 100644 --- a/src/server/game/Warden/WardenWin.h +++ b/src/server/game/Warden/WardenWin.h @@ -22,7 +22,7 @@ #include "Cryptography/ARC4.h" #include "Cryptography/BigNumber.h" #include "Warden.h" -#include +#include #if defined(__GNUC__) #pragma pack(1) diff --git a/src/server/game/Warden/enuminfo_WardenCheckMgr.cpp b/src/server/game/Warden/enuminfo_WardenCheckMgr.cpp index f76872a822..f4d906b696 100644 --- a/src/server/game/Warden/enuminfo_WardenCheckMgr.cpp +++ b/src/server/game/Warden/enuminfo_WardenCheckMgr.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "WardenCheckMgr.h" #include "Define.h" #include "SmartEnum.h" +#include "WardenCheckMgr.h" #include namespace Acore::Impl::EnumUtilsImpl diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp index 23a8015584..1546f4bd9d 100644 --- a/src/server/game/Weather/Weather.cpp +++ b/src/server/game/Weather/Weather.cpp @@ -19,10 +19,10 @@ \ingroup world */ +#include "Weather.h" #include "Player.h" #include "ScriptMgr.h" #include "Util.h" -#include "Weather.h" #include "World.h" #include "WorldPacket.h" diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp index 516b88b668..3c46d0bb3c 100644 --- a/src/server/game/Weather/WeatherMgr.cpp +++ b/src/server/game/Weather/WeatherMgr.cpp @@ -19,11 +19,11 @@ \ingroup world */ +#include "WeatherMgr.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/scripts/Commands/PlayerCommand.cpp b/src/server/scripts/Commands/PlayerCommand.cpp index d842f92810..4e14530085 100644 --- a/src/server/scripts/Commands/PlayerCommand.cpp +++ b/src/server/scripts/Commands/PlayerCommand.cpp @@ -15,9 +15,11 @@ * with this program. If not, see . */ -#include "SpellInfo.h" #include "PlayerCommand.h" #include "Language.h" +#include "Player.h" +#include "SpellInfo.h" +#include "SpellMgr.h" bool Acore::PlayerCommand::HandleLearnSpellCommand(ChatHandler* handler, Player* targetPlayer, SpellInfo const* spell, Optional allRanks) { @@ -31,23 +33,34 @@ bool Acore::PlayerCommand::HandleLearnSpellCommand(ChatHandler* handler, Player* if (!allRanks && targetPlayer->HasSpell(spell->Id)) { if (targetPlayer == handler->GetPlayer()) + { handler->SendSysMessage(LANG_YOU_KNOWN_SPELL); + } else + { handler->PSendSysMessage(LANG_TARGET_KNOWN_SPELL, handler->GetNameLink(targetPlayer).c_str()); + } + handler->SetSentErrorMessage(true); return false; } targetPlayer->learnSpell(spell->Id, false); + if (allRanks) { uint32 spellId = spell->Id; + while ((spellId = sSpellMgr->GetNextSpellInChain(spellId))) + { targetPlayer->learnSpell(spellId, false); + } } if (GetTalentSpellCost(spell->GetFirstRankSpell()->Id)) + { targetPlayer->SendTalentsInfoData(false); + } return true; } @@ -55,16 +68,25 @@ bool Acore::PlayerCommand::HandleLearnSpellCommand(ChatHandler* handler, Player* bool Acore::PlayerCommand::HandleUnlearnSpellCommand(ChatHandler* handler, Player* target, SpellInfo const* spell, Optional allRanks) { uint32 spellId = spell->Id; + if (allRanks) - spellId = sSpellMgr->GetFirstSpellInChain (spellId); + { + spellId = sSpellMgr->GetFirstSpellInChain(spellId); + } if (target->HasSpell(spellId)) + { target->removeSpell(spellId, SPEC_MASK_ALL, false); + } else + { handler->SendSysMessage(LANG_FORGET_SPELL); + } if (GetTalentSpellCost(spellId)) + { target->SendTalentsInfoData(false); + } return true; } diff --git a/src/server/scripts/Commands/PlayerCommand.h b/src/server/scripts/Commands/PlayerCommand.h index 0d8807bbd3..08603edb83 100644 --- a/src/server/scripts/Commands/PlayerCommand.h +++ b/src/server/scripts/Commands/PlayerCommand.h @@ -17,17 +17,17 @@ #ifndef _PLAYER_COMMAND_H #define _PLAYER_COMMAND_H -#include "Chat.h" -#include "Player.h" -namespace Acore +#include "Chat.h" +#include "Common.h" + +class Player; +class SpellInfo; + +namespace Acore::PlayerCommand { - // Used in player/character commands - namespace PlayerCommand - { - bool HandleLearnSpellCommand(ChatHandler* handler, Player* targetPlayer, SpellInfo const* spell, Optional allRanks); - bool HandleUnlearnSpellCommand(ChatHandler* handler, Player* targetPlayer, SpellInfo const* spell, Optional allRanks); - }; + bool HandleLearnSpellCommand(ChatHandler* handler, Player* targetPlayer, SpellInfo const* spell, Optional allRanks); + bool HandleUnlearnSpellCommand(ChatHandler* handler, Player* targetPlayer, SpellInfo const* spell, Optional allRanks); }; #endif // _PLAYER_COMMAND_H diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index cde632cb48..7d8125bfaa 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -22,8 +22,8 @@ Comment: All account related commands Category: commandscripts EndScriptData */ -#include "AccountMgr.h" #include "AES.h" +#include "AccountMgr.h" #include "Base32.h" #include "Chat.h" #include "CryptoGenerics.h" diff --git a/src/server/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp index 26e6c697d8..1fb43b2db5 100644 --- a/src/server/scripts/Commands/cs_achievement.cpp +++ b/src/server/scripts/Commands/cs_achievement.cpp @@ -22,11 +22,11 @@ Comment: All achievement related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "AchievementMgr.h" #include "Chat.h" #include "Language.h" #include "Player.h" +#include "ScriptMgr.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp index c1a14a307c..06bf77871b 100644 --- a/src/server/scripts/Commands/cs_bf.cpp +++ b/src/server/scripts/Commands/cs_bf.cpp @@ -22,9 +22,9 @@ Comment: All bf related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "BattlefieldMgr.h" #include "Chat.h" +#include "ScriptMgr.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_cache.cpp b/src/server/scripts/Commands/cs_cache.cpp index 6aea3fe438..3b8550d463 100644 --- a/src/server/scripts/Commands/cs_cache.cpp +++ b/src/server/scripts/Commands/cs_cache.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "ScriptMgr.h" #include "Chat.h" #include "Group.h" #include "Language.h" #include "Player.h" +#include "ScriptMgr.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp index 337a90b3f3..eb9d9f6dc4 100644 --- a/src/server/scripts/Commands/cs_cast.cpp +++ b/src/server/scripts/Commands/cs_cast.cpp @@ -22,11 +22,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" #include "SpellMgr.h" #include "WorldSession.h" diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index 5940ebc697..8348fb0aff 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -22,17 +22,17 @@ Comment: All character related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "AccountMgr.h" #include "Chat.h" -#include "DatabaseEnv.h" #include "DBCStores.h" +#include "DatabaseEnv.h" #include "Log.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" #include "PlayerDump.h" #include "ReputationMgr.h" +#include "ScriptMgr.h" #include "World.h" #include "WorldSession.h" diff --git a/src/server/scripts/Commands/cs_cheat.cpp b/src/server/scripts/Commands/cs_cheat.cpp index 407fdaaef2..e6919d0cc3 100644 --- a/src/server/scripts/Commands/cs_cheat.cpp +++ b/src/server/scripts/Commands/cs_cheat.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "ScriptMgr.h" #include "Chat.h" #include "Language.h" #include "Player.h" +#include "ScriptMgr.h" #include "WorldSession.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 3a8874a46d..994d379517 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -22,7 +22,6 @@ Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Bag.h" #include "BattlegroundMgr.h" #include "CellImpl.h" @@ -36,6 +35,7 @@ #include "MapMgr.h" #include "ObjectMgr.h" #include "PoolMgr.h" +#include "ScriptMgr.h" #include "SpellMgr.h" #include "Transport.h" #include "Warden.h" diff --git a/src/server/scripts/Commands/cs_deserter.cpp b/src/server/scripts/Commands/cs_deserter.cpp index b40c0e6498..6018cee1b0 100644 --- a/src/server/scripts/Commands/cs_deserter.cpp +++ b/src/server/scripts/Commands/cs_deserter.cpp @@ -22,10 +22,10 @@ * This file contains the CommandScripts for all deserter sub-commands */ -#include "ScriptMgr.h" #include "Chat.h" #include "Language.h" #include "Player.h" +#include "ScriptMgr.h" #include "SpellAuras.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp index f044495672..3c4949e51a 100644 --- a/src/server/scripts/Commands/cs_event.cpp +++ b/src/server/scripts/Commands/cs_event.cpp @@ -22,11 +22,11 @@ Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Chat.h" #include "GameEventMgr.h" #include "Language.h" #include "Player.h" +#include "ScriptMgr.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index 287eb1f133..fb4e12af25 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -22,7 +22,6 @@ Comment: All gm related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "AccountMgr.h" #include "Chat.h" #include "DatabaseEnv.h" @@ -31,6 +30,7 @@ EndScriptData */ #include "Opcodes.h" #include "Player.h" #include "Realm.h" +#include "ScriptMgr.h" #include "World.h" #include "WorldSession.h" diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp index 89ecef9866..52eac618c4 100644 --- a/src/server/scripts/Commands/cs_honor.cpp +++ b/src/server/scripts/Commands/cs_honor.cpp @@ -22,10 +22,10 @@ Comment: All honor related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Chat.h" #include "Language.h" #include "Player.h" +#include "ScriptMgr.h" #include "WorldSession.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index 6846ad7d9a..a1de1ebef1 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -22,7 +22,6 @@ Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Chat.h" #include "Group.h" #include "InstanceSaveMgr.h" @@ -31,6 +30,7 @@ #include "MapMgr.h" #include "ObjectAccessor.h" #include "Player.h" +#include "ScriptMgr.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index 10cb2da9ab..6ea772dd49 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -22,11 +22,12 @@ Comment: All learn related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Language.h" #include "ObjectMgr.h" #include "Pet.h" +#include "Player.h" #include "PlayerCommand.h" +#include "ScriptMgr.h" #include "SpellInfo.h" #include "SpellMgr.h" diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp index 07166b5d7d..681de42356 100644 --- a/src/server/scripts/Commands/cs_lfg.cpp +++ b/src/server/scripts/Commands/cs_lfg.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ -#include "ScriptMgr.h" #include "Chat.h" #include "DatabaseEnv.h" #include "Group.h" -#include "Language.h" #include "LFGMgr.h" +#include "Language.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 b381cc591c..137a55f689 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -22,11 +22,10 @@ Comment: All list related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Chat.h" #include "Creature.h" -#include "DatabaseEnv.h" #include "DBCStores.h" +#include "DatabaseEnv.h" #include "GameObject.h" #include "Language.h" #include "MapMgr.h" @@ -34,6 +33,7 @@ EndScriptData */ #include "ObjectMgr.h" #include "Player.h" #include "Random.h" +#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "WorldSession.h" diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp index 998c505a05..f08ef1cb20 100644 --- a/src/server/scripts/Commands/cs_lookup.cpp +++ b/src/server/scripts/Commands/cs_lookup.cpp @@ -32,6 +32,7 @@ EndScriptData */ #include "ReputationMgr.h" #include "ScriptMgr.h" #include "SpellInfo.h" +#include "SpellMgr.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp index 216a066588..e09247078f 100644 --- a/src/server/scripts/Commands/cs_message.cpp +++ b/src/server/scripts/Commands/cs_message.cpp @@ -22,16 +22,16 @@ Comment: All message related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Channel.h" #include "ChannelMgr.h" #include "Chat.h" -#include "DatabaseEnv.h" #include "DBCStores.h" +#include "DatabaseEnv.h" #include "Language.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" +#include "ScriptMgr.h" #include "World.h" #include "WorldSession.h" diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index a2f80bca95..83a4e5844d 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -23,13 +23,14 @@ #include "Chat.h" #include "GameGraveyard.h" #include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "Group.h" #include "GroupMgr.h" #include "GuildMgr.h" -#include "InstanceSaveMgr.h" #include "IPLocation.h" -#include "Language.h" +#include "InstanceSaveMgr.h" #include "LFG.h" +#include "Language.h" #include "MapMgr.h" #include "MovementGenerator.h" #include "ObjectAccessor.h" diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index 14cdc36037..2754374823 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -27,8 +27,8 @@ #include "Chat.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "Map.h" #include "MMapFactory.h" +#include "Map.h" #include "ObjectMgr.h" #include "PathGenerator.h" #include "Player.h" diff --git a/src/server/scripts/Commands/cs_player.cpp b/src/server/scripts/Commands/cs_player.cpp index 5fbab32d4c..af7fe6867a 100644 --- a/src/server/scripts/Commands/cs_player.cpp +++ b/src/server/scripts/Commands/cs_player.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptMgr.h" #include "PlayerCommand.h" +#include "ScriptMgr.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index d5a3c6920d..0c1b73d99f 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -29,8 +29,8 @@ EndScriptData */ #include "CreatureTextMgr.h" #include "DisableMgr.h" #include "GameGraveyard.h" -#include "Language.h" #include "LFGMgr.h" +#include "Language.h" #include "MapMgr.h" #include "ObjectMgr.h" #include "ScriptMgr.h" @@ -38,11 +38,11 @@ EndScriptData */ #include "SkillExtraItems.h" #include "SmartAI.h" #include "SpellMgr.h" +#include "StringConvert.h" #include "TicketMgr.h" +#include "Tokenize.h" #include "WardenCheckMgr.h" #include "WaypointMgr.h" -#include "StringConvert.h" -#include "Tokenize.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index ce0b8ab118..1759e10429 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -35,11 +35,11 @@ #include "StringConvert.h" #include "VMapFactory.h" #include "VMapMgr2.h" -#include #include +#include +#include #include #include -#include using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index e8dd2c11dc..ea552f59de 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -22,13 +22,13 @@ Comment: All tele related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Chat.h" #include "Group.h" #include "Language.h" #include "MapMgr.h" #include "ObjectMgr.h" #include "Player.h" +#include "ScriptMgr.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp index d827bcddf8..4482e82673 100644 --- a/src/server/scripts/Commands/cs_titles.cpp +++ b/src/server/scripts/Commands/cs_titles.cpp @@ -22,11 +22,11 @@ Comment: All titles related commands Category: commandscripts EndScriptData */ -#include "ScriptMgr.h" #include "Chat.h" #include "DBCStores.h" #include "Language.h" #include "Player.h" +#include "ScriptMgr.h" using namespace Acore::ChatCommands; diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index 8741033a2a..ee428aeab9 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index 4c49a8106a..d2c22a5167 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index fb16dda8f9..f9a1019a39 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index 465e6d7fe8..548d235a0f 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index 4a7cbf9441..f28d7d2025 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 96eea66f92..22bfef0a91 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp @@ -17,10 +17,10 @@ #include "blackrock_depths.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "WorldSession.h" enum ShadowforgeBrazier 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 01734f1b7d..d851ae9581 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_depths.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_depths.h" #include 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 eefbb4dfa9..a5a490cdf9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_depths.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_depths.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 e1231d3e48..19c564bb14 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_depths.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_depths.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 2e2ce0a924..fd73eed5b5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_depths.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_depths.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 bd797adcde..d715e02196 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_depths.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_depths.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 1f0424311b..100d625286 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_depths.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_depths.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 ce684a205e..7549d65272 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_depths.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_depths.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 5f89d05892..2f514e1721 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_depths.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_depths.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 528c6b1118..ff908e6530 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_depths.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_depths.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 32af3b4dfa..9f3e33ea98 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 @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "blackrock_depths.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" +#include "blackrock_depths.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 fb1974a09e..79c50c858b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "blackrock_depths.h" -#include "Player.h" #include "InstanceScript.h" +#include "Player.h" #include "ScriptMgr.h" +#include "blackrock_depths.h" #define MAX_ENCOUNTER 6 diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp index 80c553b708..17027020e0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_spire.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.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 66d73aebeb..68c47301eb 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_spire.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.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 a70fce59af..ebccd22ccc 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_spire.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.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 6114530ab9..d989057f86 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_spire.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.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 b8236d2df5..efe5c6e5d5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_spire.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.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 472d244162..c47cdb6e53 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_spire.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.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 b5cba5ddc3..7f5f9eb738 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ -#include "blackrock_spire.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" +#include "blackrock_spire.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 d8f6bdc5da..da4b1e2b5c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp @@ -16,9 +16,9 @@ */ #include "ScriptMgr.h" -#include "blackrock_spire.h" #include "ScriptedCreature.h" #include "SpellInfo.h" +#include "blackrock_spire.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 2a7b438ee2..623fc7d238 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "blackrock_spire.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.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 52bee00c23..ee6c239ee1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "blackrock_spire.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.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 b501026a31..1244af65b3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_spire.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.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 8b56e781cb..e747e20c0b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackrock_spire.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.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 799991ccdc..ed5cd03a59 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -15,7 +15,6 @@ * with this program. If not, see . */ -#include "blackrock_spire.h" #include "Cell.h" #include "CellImpl.h" #include "GridNotifiers.h" @@ -23,8 +22,9 @@ #include "InstanceScript.h" #include "ObjectDefines.h" #include "ObjectMgr.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackrock_spire.h" uint32 const DragonspireMobs[3] = { NPC_BLACKHAND_DREADWEAVER, NPC_BLACKHAND_SUMMONER, NPC_BLACKHAND_VETERAN }; 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 b5ce73efa2..3a0caac593 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ -#include "blackwing_lair.h" #include "GameObject.h" #include "GameObjectAI.h" #include "InstanceScript.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackwing_lair.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 df48b8f237..9d6bcb9036 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp @@ -15,14 +15,14 @@ * with this program. If not, see . */ -#include "blackwing_lair.h" #include "GameObject.h" #include "GameObjectAI.h" #include "InstanceScript.h" #include "Map.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackwing_lair.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 40efe427d1..91291b6cff 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackwing_lair.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackwing_lair.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 75ff391ff0..00c1854132 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackwing_lair.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackwing_lair.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 05fd831146..01bb294674 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackwing_lair.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blackwing_lair.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 7c5e7952a6..4cbe9f0e2b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -15,15 +15,15 @@ * with this program. If not, see . */ -#include "blackwing_lair.h" #include "GameObject.h" #include "InstanceScript.h" #include "MotionMaster.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "TemporarySummon.h" +#include "blackwing_lair.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 44fe2a5c6c..9365c510e0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "blackwing_lair.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "blackwing_lair.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 5619d1dece..1bcda807ac 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -15,14 +15,14 @@ * with this program. If not, see . */ -#include "blackwing_lair.h" #include "ObjectAccessor.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" +#include "blackwing_lair.h" constexpr float aNefariusSpawnLoc[4] = { -7466.16f, -1040.80f, 412.053f, 2.14675f }; 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 4eeaa3f3e4..28b5fd823c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp @@ -15,17 +15,17 @@ * with this program. If not, see . */ -#include "blackwing_lair.h" #include "GameObject.h" #include "InstanceScript.h" #include "Map.h" #include "MotionMaster.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "TemporarySummon.h" +#include "blackwing_lair.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 18dc750ca4..21e9b76b10 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -17,9 +17,9 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "molten_core.h" #include "SpellAuraEffects.h" #include "SpellScript.h" +#include "molten_core.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 78490c806f..7fe3052d00 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "ScriptMgr.h" #include "Containers.h" #include "ObjectAccessor.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "SpellAuras.h" #include "SpellInfo.h" diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp index 1b1c505551..f34191403f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "ObjectAccessor.h" +#include "ObjectMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "molten_core.h" -#include "ObjectMgr.h" -#include "ObjectAccessor.h" enum Texts { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp index 0e52b99eb3..14fa986b65 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp @@ -16,8 +16,8 @@ */ #include "ScriptMgr.h" -#include "SpellScript.h" #include "ScriptedCreature.h" +#include "SpellScript.h" #include "molten_core.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 b9ab56ed3d..585fd151b4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ +#include "ObjectAccessor.h" +#include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "molten_core.h" -#include "Player.h" #include "ScriptedGossip.h" -#include "ObjectAccessor.h" #include "SpellScript.h" +#include "molten_core.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 df2c740207..9bc0cf6260 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "SpellScript.h" #include "molten_core.h" -#include "Player.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 8f3990a915..8dd5aa75a9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp @@ -15,12 +15,10 @@ * with this program. If not, see . */ -#include "ScriptMgr.h" #include "InstanceScript.h" #include "ObjectMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "InstanceScript.h" #include "TemporarySummon.h" #include "molten_core.h" diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp index d0b3d7f5cd..a6787a6616 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ +#include "molten_core.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "SpellScript.h" -#include "molten_core.h" enum Texts { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h index 9706e300e6..8453443bae 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h @@ -18,7 +18,10 @@ #ifndef DEF_MOLTEN_CORE_H #define DEF_MOLTEN_CORE_H -#define MCScriptName "instance_molten_core" +#include "CreatureAIImpl.h" +#include "Object.h" + +constexpr auto MCScriptName = "instance_molten_core"; constexpr uint32 MAX_ENCOUNTER = 10; diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index 783307bd42..0e8f95920b 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "deadmines.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "deadmines.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 333ad6bbf7..e09d0bd4a1 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "deadmines.h" #include "InstanceScript.h" #include "ScriptMgr.h" +#include "deadmines.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 657c79daf8..209fbe8a12 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ -#include "gnomeregan.h" #include "InstanceScript.h" #include "PassiveAI.h" #include "Player.h" #include "ScriptMgr.h" #include "SpellScript.h" +#include "gnomeregan.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 01bb97fe79..a9d19d369e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "karazhan.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "karazhan.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 5b37e4ed1e..e00717cc0c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "karazhan.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "karazhan.h" enum MaidenOfVirtue { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index b73f7f9b21..a4508d9856 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "karazhan.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 17390e8942..e10681240f 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "karazhan.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "karazhan.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 5402dc63fb..5696ff47f2 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -22,10 +22,10 @@ SDComment: Not sure about timing and portals placing SDCategory: Karazhan EndScriptData */ -#include "karazhan.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "karazhan.h" enum Netherspite { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index cdbfb04bf7..6cb14a9f7a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -22,10 +22,10 @@ SDComment: SDComment: Timers may incorrect SDCategory: Karazhan EndScriptData */ -#include "karazhan.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "karazhan.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 5d5532148b..02a26e729e 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "karazhan.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" +#include "karazhan.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 ccb3b36c3d..bc592f5ab7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "karazhan.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "karazhan.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 ee9c43c301..697a9a634d 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -16,10 +16,10 @@ */ #include "GameObject.h" -#include "karazhan.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" +#include "karazhan.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 1e50b87d0a..cf8a303917 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -22,10 +22,10 @@ SDComment: Complete! Needs adjustments to use spell though. SDCategory: Karazhan EndScriptData */ -#include "karazhan.h" #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "karazhan.h" enum TerestianIllhoof { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 02d9c0a6e6..bc1d46c7e5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -22,12 +22,12 @@ SDComment: Oz, Hood, and RAJ event implemented. RAJ event requires more testing. SDCategory: Karazhan EndScriptData */ -#include "karazhan.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellInfo.h" +#include "karazhan.h" /***********************************/ /*** OPERA WIZARD OF OZ EVENT *****/ diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index e48426fc05..63295adc1f 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -18,12 +18,12 @@ #include "Creature.h" #include "GameObject.h" #include "InstanceScript.h" -#include "karazhan.h" #include "Map.h" #include "Player.h" #include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" +#include "karazhan.h" const Position OptionalSpawn[] = { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 8aed47c275..42aa320509 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -30,10 +30,10 @@ EndContentData */ #include "karazhan.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 7b8e2a6437..62f12da035 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "magisters_terrace.h" #include "Opcodes.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "magisters_terrace.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 f45c156e8a..cc6305adf2 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "magisters_terrace.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "magisters_terrace.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 090e2bb0f7..e39511f7d2 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "magisters_terrace.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "magisters_terrace.h" enum Says { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index cd6347cacd..41fb661e16 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "magisters_terrace.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "magisters_terrace.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 cb1ad6c339..10476d5696 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -16,8 +16,8 @@ */ #include "InstanceScript.h" -#include "magisters_terrace.h" #include "ScriptMgr.h" +#include "magisters_terrace.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 41cd47ab26..0aac2e80ea 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h @@ -19,9 +19,9 @@ #define DEF_MAGISTERS_TERRACE_H #include "CreatureAI.h" +#include "CreatureAIImpl.h" #include "Player.h" #include "SpellScript.h" -#include "CreatureAIImpl.h" #define MTScriptName "instance_magisters_terrace" diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 4741073180..de7d4d0a6c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -20,10 +20,10 @@ #include "ObjectMgr.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellInfo.h" #include "SpellScript.h" #include "Vehicle.h" diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index d444a14b72..e9c596ace9 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -18,9 +18,9 @@ #include "CombatAI.h" #include "CreatureTextMgr.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" #include "SpellInfo.h" #include "SpellScript.h" diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index bd27b6cf50..ca87bc00aa 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -16,9 +16,9 @@ */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.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 4e8cbcea2d..d392dcd54c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp @@ -17,8 +17,8 @@ #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 35e3b273f1..f416f0928f 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "scarletmonastery.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SmartAI.h" +#include "scarletmonastery.h" enum AshbringerEventMisc { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index bdb480a3a4..484f9ccb8d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ -#include "scholomance.h" -#include "ScriptedCreature.h" -#include "ScriptMgr.h" -#include "SpellScript.h" #include "Map.h" #include "Player.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "SpellScript.h" +#include "scholomance.h" enum Spells { 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 1689d43219..7028dfa925 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -18,9 +18,9 @@ #include "GameObjectAI.h" #include "MoveSplineInit.h" #include "Player.h" -#include "scholomance.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "scholomance.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index 43b7a265e6..5c10b5dab4 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -18,11 +18,11 @@ #include "GameObjectAI.h" #include "InstanceScript.h" #include "Player.h" -#include "scholomance.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "SpellScript.h" +#include "scholomance.h" Position KirtonosSpawn = Position(315.028, 70.5385, 102.15, 0.385971); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 2bc7ce0faa..497e6ec97a 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -17,8 +17,8 @@ #include "InstanceScript.h" #include "ScriptMgr.h" -#include "shadowfang_keep.h" #include "TemporarySummon.h" +#include "shadowfang_keep.h" //enum Creatures //{ diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index 1bdaf7fb57..25402e2394 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -20,8 +20,8 @@ #include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "stratholme.h" #include "TaskScheduler.h" +#include "stratholme.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 78600908f7..b23389e958 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -17,8 +17,8 @@ #include "InstanceScript.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "stratholme.h" const Position BlackGuardPos[10] = diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 184dd4e1e6..3e3dff0112 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -15,8 +15,9 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "WorldSession.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 9cc4a35e5f..242cf617fe 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "sunwell_plateau.h" diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index b456f94948..077969190a 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -18,8 +18,8 @@ #include "Cell.h" #include "CellImpl.h" #include "GridNotifiers.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 904eb761d8..5e192bdaf9 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -16,10 +16,10 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "sunwell_plateau.h" +#include "ScriptedCreature.h" #include "WorldSession.h" +#include "sunwell_plateau.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 963b347f20..8570340025 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -17,8 +17,8 @@ #include "CreatureTextMgr.h" #include "MoveSplineInit.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 95e5597fba..f41a607f4a 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "sunwell_plateau.h" diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index bb2ce7a1b1..d61c5681b6 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -28,8 +28,8 @@ EndScriptData */ #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Weather.h" #include "zulaman.h" diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index f85518b997..6efac7b520 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "zulaman.h" diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index c513597d29..619c8db6d6 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -22,8 +22,8 @@ SDComment: SDCategory: Zul'Aman EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "zulaman.h" diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 2030c3b0ad..33d63de412 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -24,8 +24,9 @@ EndScriptData */ #include "CellImpl.h" #include "GridNotifiers.h" -#include "ScriptedCreature.h" +#include "GridNotifiersImpl.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 f786473725..ab394c3093 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -25,8 +25,8 @@ EndScriptData */ #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 c14a72c1b1..5b56e15b7f 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -21,8 +21,8 @@ SD%Complete: 85% SDComment: EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "zulaman.h" diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 14e61de9d5..1c1ab3a9ed 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -26,13 +26,13 @@ EndScriptData */ npc_forest_frog EndContentData */ +#include "zulaman.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.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 78895f3360..e6d1ed3ff2 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -24,8 +24,8 @@ TCComment: Can't test LOS until mmaps. TCCategory: Zul'Gurub EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 0bfd00ae70..33deb0f065 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp @@ -22,8 +22,8 @@ SDComment: Massive Geyser with knockback not working. Spell buggy. SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 7e71aa5b90..9ca0b572ee 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -22,8 +22,8 @@ SDComment: SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 dbca29f5f5..40085ad1f8 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -22,9 +22,9 @@ Comment: Blood siphon spell buggy cause of Core Issue. Category: Zul'Gurub */ -#include "ScriptedCreature.h" -#include "ScriptMgr.h" #include "Player.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.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 b7c7b131d9..a94fb12462 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -22,8 +22,8 @@ SDComment: SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 d5ada248f7..37d410028c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 2d7a9c6047..69992f4991 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -22,8 +22,8 @@ SDComment: Mind Control not working because of core bug. Shades visible for all. SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 7c7ad28569..371329b7be 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -22,8 +22,8 @@ SDComment: Ohgan function needs improvements. SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 7977dbef42..886a7c86df 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -22,8 +22,8 @@ SDComment: Charging healers and casters not working. Perhaps wrong Spell Timers. SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 051dded0d2..7dc920552e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -22,8 +22,8 @@ SDComment: SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 baa08fb683..8b5ad98366 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -22,8 +22,8 @@ SDComment: Almost finished. SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 53a8e8ef6b..0a82824cfd 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 56095f8a60..6cae4f573d 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -22,8 +22,8 @@ SDComment: SDCategory: Zul'Gurub EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "zulgurub.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp index 39ae946844..3817dc3021 100644 --- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp @@ -27,9 +27,9 @@ npc_professor_phizzlethorpe EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.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 13b9a9d9fc..97d0de9898 100644 --- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp @@ -22,8 +22,8 @@ Quest support: 3628. Teleporter to Rise of the Defiler. #include "Group.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" /*##### diff --git a/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp b/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp index fe5e25a716..6ebb65ac59 100644 --- a/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp +++ b/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp @@ -17,8 +17,8 @@ #include "Player.h" #include "ScriptMgr.h" -#include "ScriptedGossip.h" #include "ScriptedCreature.h" +#include "ScriptedGossip.h" /*###### ## NPC 9836: Maredis Firestar diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 5fed808257..cf1ec75086 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -23,8 +23,8 @@ SDCategory: Duskwood EndScriptData */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" enum TwilightCorrupter { diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index 589f05f071..83d9c06f92 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -31,9 +31,9 @@ EndContentData */ #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellInfo.h" #include "WorldSession.h" diff --git a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp index 0a8660e6ea..c342629d57 100644 --- a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp @@ -27,10 +27,10 @@ npc_ranger_lilatha EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" /*###### ## npc_ranger_lilatha diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index 0953f5c074..6df6984a56 100644 --- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp @@ -27,9 +27,9 @@ npc_rinji EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" /*###### ## npc_rinji diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index 9619c18af4..9cf6e6ea71 100644 --- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp @@ -30,8 +30,8 @@ EndContentData */ #include "PassiveAI.h" #include "Pet.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "SpellScript.h" diff --git a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp index eb709e6c6c..f9ae7e6206 100644 --- a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp @@ -22,9 +22,9 @@ SDComment: Support for quest 219. Script Data End */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.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 6582b7b3f8..0cfdf5afa8 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -28,9 +28,9 @@ pyrewood_ambush EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.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 53a60cfde6..dbc16c092b 100644 --- a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp @@ -32,10 +32,10 @@ npc_lord_gregor_lescovar EndContentData */ #include "Player.h" +#include "ScriptMgr.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 4e829879a5..0fa5bdb2bd 100644 --- a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp @@ -27,8 +27,8 @@ npc_yenniku EndContentData */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" /*###### diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp index 96e75c55f5..5781354f9e 100644 --- a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp @@ -29,8 +29,8 @@ go_mausoleum_trigger EndContentData */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" /*###### ## npc_calvin_montague diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 4451c74d9e..7f2e5debad 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -30,10 +30,10 @@ EndContentData */ #include "ObjectAccessor.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellAuras.h" #include "SpellScript.h" diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index 8182187d12..58a47c94b2 100644 --- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp @@ -28,9 +28,9 @@ npc_andorhal_tower EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.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 4b978976ce..62090c1266 100644 --- a/src/server/scripts/EasternKingdoms/zone_westfall.cpp +++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp @@ -27,9 +27,9 @@ npc_daphne_stilwell EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.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 fd3bc9913c..119ef3ec41 100644 --- a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp @@ -28,9 +28,9 @@ npc_tapoke_slim_jahn EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.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 0fe221f5f0..ec299e5d0a 100644 --- a/src/server/scripts/Events/brewfest.cpp +++ b/src/server/scripts/Events/brewfest.cpp @@ -22,9 +22,9 @@ #include "Group.h" #include "LFGMgr.h" #include "PassiveAI.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellAuras.h" #include "SpellScript.h" diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 999f7bec01..eca6a9df58 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 a68a9b5270..47d6c454ca 100644 --- a/src/server/scripts/Events/hallows_end.cpp +++ b/src/server/scripts/Events/hallows_end.cpp @@ -19,11 +19,12 @@ #include "GameObjectAI.h" #include "GossipDef.h" #include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "Group.h" #include "LFGMgr.h" #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "TaskScheduler.h" diff --git a/src/server/scripts/Events/love_in_air.cpp b/src/server/scripts/Events/love_in_air.cpp index 7769890459..4db3d1f503 100644 --- a/src/server/scripts/Events/love_in_air.cpp +++ b/src/server/scripts/Events/love_in_air.cpp @@ -22,8 +22,8 @@ #include "Group.h" #include "LFGMgr.h" #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" /////////////////////////////////////// diff --git a/src/server/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp index 31f180a77e..1b769815fe 100644 --- a/src/server/scripts/Events/midsummer.cpp +++ b/src/server/scripts/Events/midsummer.cpp @@ -16,9 +16,9 @@ */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "Spell.h" #include "SpellAuras.h" #include "SpellScript.h" diff --git a/src/server/scripts/Events/pilgrims_bounty.cpp b/src/server/scripts/Events/pilgrims_bounty.cpp index 133e3aaedf..84e2a38853 100644 --- a/src/server/scripts/Events/pilgrims_bounty.cpp +++ b/src/server/scripts/Events/pilgrims_bounty.cpp @@ -18,8 +18,8 @@ #include "CombatAI.h" #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "Vehicle.h" diff --git a/src/server/scripts/Events/winter_veil.cpp b/src/server/scripts/Events/winter_veil.cpp index 1c22d679f5..40c940e38d 100644 --- a/src/server/scripts/Events/winter_veil.cpp +++ b/src/server/scripts/Events/winter_veil.cpp @@ -17,8 +17,8 @@ #include "GameEventMgr.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" #include "SpellScript.h" diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index 42699494d0..9c43e3ea66 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blackfathom_deeps.h" #include "InstanceScript.h" #include "ScriptMgr.h" +#include "blackfathom_deeps.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 b473eeafc9..d8746b8091 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "hyjal_trash.h" -#include "hyjal.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "hyjal.h" +#include "hyjal_trash.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 ec8d77c274..9ac32f99e7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -22,12 +22,12 @@ SDComment: Doomfires not completely offlike due to core limitations for random m SDCategory: Caverns of Time, Mount Hyjal EndScriptData */ -#include "hyjal.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "SpellScript.h" +#include "hyjal.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 579ff7737b..d8587e38e0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "hyjal_trash.h" -#include "hyjal.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "hyjal.h" +#include "hyjal_trash.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 e682bb1d57..9e122caeaf 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ -#include "hyjal_trash.h" -#include "hyjal.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 e51160eb59..afa6fe745c 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "hyjal_trash.h" -#include "hyjal.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "hyjal.h" +#include "hyjal_trash.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 53535aa46d..b7ed192e72 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -28,11 +28,11 @@ npc_thrall npc_tyrande_whisperwind EndContentData */ -#include "hyjalAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" +#include "hyjalAI.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/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h index b8f2b14b73..13210662cc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h @@ -18,8 +18,8 @@ #ifndef DEF_HYJAL_H #define DEF_HYJAL_H -#include "GridNotifiers.h" #include "CreatureAIImpl.h" +#include "GridNotifiers.h" #define HyjalScriptName "instance_hyjal" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index e7d4c2c734..073158a801 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -22,14 +22,14 @@ SDComment: SDCategory: Caverns of Time, Mount Hyjal EndScriptData */ +#include "hyjalAI.h" #include "Cell.h" #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "hyjal_trash.h" -#include "hyjalAI.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" +#include "hyjal_trash.h" enum Spawns { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index 6307414c6b..618abf50fd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -18,8 +18,8 @@ #ifndef SC_HYJALAI_H #define SC_HYJALAI_H -#include "hyjal.h" #include "ScriptedEscortAI.h" +#include "hyjal.h" #define HYJAL_AI_MAX_SPELLS 3 diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index bbe5c799b0..f9790d1427 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -16,9 +16,9 @@ */ #include "hyjal_trash.h" -#include "hyjal.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "hyjal.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h index 27b8ddbac9..9f8847a3a6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h @@ -18,8 +18,8 @@ #ifndef SC_HYJAL_TRASH_AI_H #define SC_HYJAL_TRASH_AI_H -#include "hyjal.h" #include "ScriptedEscortAI.h" +#include "hyjal.h" #define MINRAIDDAMAGE 700000//minimal damage before trash can drop loot and reputation, resets if faction leader dies diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index a6f25dde16..501231c458 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -23,11 +23,11 @@ SDCategory: Caverns of Time, Mount Hyjal EndScriptData */ #include "Chat.h" -#include "hyjal_trash.h" #include "InstanceScript.h" #include "Opcodes.h" #include "ScriptMgr.h" #include "WorldPacket.h" +#include "hyjal_trash.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 0e8072405a..9319290f77 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "culling_of_stratholme.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" +#include "culling_of_stratholme.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 b3746a65f0..0ffe8e1938 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "culling_of_stratholme.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "culling_of_stratholme.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 ee44359607..05d732b624 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "culling_of_stratholme.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "culling_of_stratholme.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 2514901269..5a17d7b4e3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "culling_of_stratholme.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "culling_of_stratholme.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 edd3a94d64..9fddcd7aff 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "culling_of_stratholme.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "culling_of_stratholme.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 93e9d2b30a..e9668ec6fa 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -18,10 +18,10 @@ #include "culling_of_stratholme.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.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/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index abfa09ff4a..beb32e322f 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 @@ -16,12 +16,12 @@ */ #include "CreatureTextMgr.h" -#include "culling_of_stratholme.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "TemporarySummon.h" +#include "culling_of_stratholme.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 f0a7273064..1d7ce17e5d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "old_hillsbrad.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "old_hillsbrad.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 5fe4aaaee9..34360d329e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "old_hillsbrad.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "old_hillsbrad.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 12066a1df8..ed7610f628 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp @@ -16,10 +16,10 @@ */ #include "MoveSplineInit.h" -#include "old_hillsbrad.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SmartScriptMgr.h" +#include "old_hillsbrad.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 a6c75cdc00..f00c647661 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -16,10 +16,10 @@ */ #include "InstanceScript.h" -#include "old_hillsbrad.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "old_hillsbrad.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 f31959e1fd..408085f906 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -17,10 +17,10 @@ #include "old_hillsbrad.h" #include "Player.h" +#include "ScriptMgr.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 5309464bbb..c6eec12a16 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 44ae59394d..30365a3f0f 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 @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 c632a86271..4a957861ea 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 dce168d4b2..b0c4bfcb98 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 @@ -17,8 +17,8 @@ #include "InstanceScript.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "TemporarySummon.h" #include "the_black_morass.h" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index 71c1314c8e..7d913c4832 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "the_black_morass.h" #include "MoveSplineInit.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" -#include "the_black_morass.h" enum medivhSays { diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp index e121dfb6a6..c22aa439c9 100644 --- a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp +++ b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "dire_maul.h" #include "InstanceScript.h" #include "ScriptMgr.h" +#include "dire_maul.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 bfb529a065..969854c996 100644 --- a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp @@ -16,8 +16,8 @@ */ #include "InstanceScript.h" -#include "maraudon.h" #include "ScriptMgr.h" +#include "maraudon.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 d61d1e6f6f..fcc2d4c25b 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "onyxias_lair.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" +#include "onyxias_lair.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 fc050564ad..f3ae661d0b 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "onyxias_lair.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "onyxias_lair.h" class instance_onyxias_lair : 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 a03fdb45fb..0d9e9076a5 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -17,8 +17,8 @@ #include "InstanceScript.h" #include "ObjectMgr.h" -#include "razorfen_downs.h" #include "ScriptMgr.h" +#include "razorfen_downs.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 fc8a172ff5..67e2891ac5 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -15,15 +15,15 @@ * with this program. If not, see . */ +#include "razorfen_downs.h" #include "Cell.h" #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "Player.h" -#include "razorfen_downs.h" +#include "ScriptMgr.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/RazorfenDowns/razorfen_downs.h b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h index 4faf5f834c..61a9da0b20 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h @@ -18,8 +18,8 @@ #ifndef DEF_RAZORFEN_DOWNS_H #define DEF_RAZORFEN_DOWNS_H -#include "PassiveAI.h" #include "CreatureAIImpl.h" +#include "PassiveAI.h" #define RazorfenDownsScriptName "instance_razorfen_downs" diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index 825ecd3e00..e9d49314c2 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -16,9 +16,9 @@ */ #include "Player.h" -#include "ruins_of_ahnqiraj.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "ruins_of_ahnqiraj.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index 90a4242bb2..e0c4ff8e4f 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "ruins_of_ahnqiraj.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "ruins_of_ahnqiraj.h" enum Emotes { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 7e5a95de33..437dfdda7c 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -16,9 +16,9 @@ */ #include "CreatureTextMgr.h" -#include "ruins_of_ahnqiraj.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "ruins_of_ahnqiraj.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index afce575ead..92d0573ea0 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "ruins_of_ahnqiraj.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "ruins_of_ahnqiraj.h" enum Texts { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index 22049f67a2..abe782f013 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -17,11 +17,11 @@ #include "Opcodes.h" #include "Player.h" -#include "ruins_of_ahnqiraj.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "WorldPacket.h" +#include "ruins_of_ahnqiraj.h" enum Texts { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index eba3ad794d..b1727873b3 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "ruins_of_ahnqiraj.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "ruins_of_ahnqiraj.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 2d352a32d1..5cb1e8373c 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -16,8 +16,8 @@ */ #include "InstanceScript.h" -#include "ruins_of_ahnqiraj.h" #include "ScriptMgr.h" +#include "ruins_of_ahnqiraj.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 71a1f5f896..72b9c1b7b2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -22,8 +22,8 @@ SDComment: SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 3dd87596d9..73467f57c7 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -23,8 +23,8 @@ SDCategory: Temple of Ahn'Qiraj EndScriptData */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "temple_of_ahnqiraj.h" /* diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 4488990109..99cf5ac9a2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -22,8 +22,8 @@ SDComment: sound not implemented SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "temple_of_ahnqiraj.h" #define SOUND_SENTENCE_YOU 8588 diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index dfc1a7898f..8e70ab8b49 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -22,8 +22,8 @@ SDComment: SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "temple_of_ahnqiraj.h" enum Huhuran diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 0b640a0ecf..6a252aba2d 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -22,8 +22,8 @@ SDComment: No model for submerging. Currently just invisible. SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 7bdea4ca7d..85ab7166cd 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -22,8 +22,8 @@ SDComment: SDCategory: Temple of Ahn'Qiraj EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "temple_of_ahnqiraj.h" enum Sartura diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index a1bbe3b509..70ee7f4ba1 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 a6553b321c..467e89bb0f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -23,11 +23,11 @@ SDCategory: Temple of Ahn'Qiraj EndScriptData */ #include "Item.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" -#include "temple_of_ahnqiraj.h" #include "WorldPacket.h" +#include "temple_of_ahnqiraj.h" enum Spells { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index 74442dd131..f5e0f27865 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "temple_of_ahnqiraj.h" diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index bc7aafdf08..c2cb324f70 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -27,8 +27,8 @@ EndScriptData */ #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" #include "WorldPacket.h" diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 4f11d571c5..f9f59db283 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -16,21 +16,21 @@ npc_sergeant_bly npc_weegli_blastfuse EndContentData */ -#include "ScriptMgr.h" -#include "ScriptSystem.h" +#include "zulfarrak.h" +#include "Cell.h" +#include "CellImpl.h" #include "GameObject.h" #include "GameObjectAI.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "InstanceScript.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" +#include "ScriptMgr.h" +#include "ScriptSystem.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "zulfarrak.h" -#include "Cell.h" -#include "CellImpl.h" -#include "GridNotifiers.h" -#include "GridNotifiersImpl.h" /*###### ## npc_sergeant_bly diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h index 5fdc6cb3d8..bd7ff856ef 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h @@ -18,8 +18,8 @@ #ifndef DEF_ZULFARRACK_H #define DEF_ZULFARRACK_H -#include "CreatureAIImpl.h" #include "CellImpl.h" +#include "CreatureAIImpl.h" #include "SpellScript.h" #define ZFScriptName "instance_zulfarrak" diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 961183d62e..7ebebd5259 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -22,8 +22,8 @@ SDComment: Teleport not included, spell reflect not effecting dots (Core problem SDCategory: Azshara EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" enum Say { diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index 8158aeee38..6480fb7d64 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -23,9 +23,9 @@ SDCategory: Ashenvale Forest EndScriptData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" enum Muglash { diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp index d433e243bd..1eb1c5e3c0 100644 --- a/src/server/scripts/Kalimdor/zone_azshara.cpp +++ b/src/server/scripts/Kalimdor/zone_azshara.cpp @@ -29,9 +29,9 @@ npc_depth_charge EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.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 0c9ca11711..4c7d110f9f 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -35,10 +35,10 @@ EndContentData */ #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.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 392baf2f80..c7925dd87c 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -27,8 +27,8 @@ npc_webbed_creature EndContentData */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" /*###### ## npc_webbed_creature diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index d4278025a9..a60604fdc8 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -27,10 +27,10 @@ npc_aged_dying_ancient_kodo EndContentData */ #include "Player.h" +#include "ScriptMgr.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 b038e6079d..fe3afce184 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" #include "Vehicle.h" diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index 18f18098ec..622155639f 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -29,9 +29,9 @@ npc_cassa_crimsonwing - handled by npc_taxi EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellScript.h" #include "WorldSession.h" diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp index bbff20ddb6..9209609482 100644 --- a/src/server/scripts/Kalimdor/zone_felwood.cpp +++ b/src/server/scripts/Kalimdor/zone_felwood.cpp @@ -27,9 +27,9 @@ npcs_riverbreeze_and_silversky EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.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 b13e1891a1..158f42b5ba 100644 --- a/src/server/scripts/Kalimdor/zone_feralas.cpp +++ b/src/server/scripts/Kalimdor/zone_feralas.cpp @@ -24,10 +24,10 @@ EndScriptData */ #include "Group.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellScript.h" enum GordunniTrap diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index bffa0332ed..dbea39a6f6 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -35,10 +35,10 @@ EndContentData */ #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellInfo.h" /*###### diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp index d878df6b67..98da89a9eb 100644 --- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp @@ -28,9 +28,9 @@ npc_thrall_warchief EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.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 2078c37870..ce3b456e00 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -29,15 +29,16 @@ EndContentData */ #include "AccountMgr.h" #include "BanMgr.h" -#include "Group.h" -#include "Player.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "ScriptMgr.h" -#include "Spell.h" -#include "SpellInfo.h" #include "GameObject.h" #include "GameObjectAI.h" +#include "Group.h" +#include "Player.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "Spell.h" +#include "SpellInfo.h" +#include "WorldSession.h" /*#### # quest_a_pawn_on_the_eternal_board (Defines) diff --git a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp index 06c1be8337..55d0907ecd 100644 --- a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp @@ -28,10 +28,10 @@ npc_kaya_flathoof EndContentData */ #include "Player.h" +#include "ScriptMgr.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 46cea901ee..8b03808967 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -31,11 +31,11 @@ npc_tooga EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedFollowerAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "WorldSession.h" /*###### diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index f6d3b6b976..dbab758a59 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -32,10 +32,10 @@ npc_wizzlecrank_shredder EndContentData */ #include "Player.h" +#include "ScriptMgr.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 620e2cf7bc..b2a7d52202 100644 --- a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp @@ -31,10 +31,10 @@ go_panther_cage EndContentData */ #include "Player.h" +#include "ScriptMgr.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 8d495b0188..5ea1dc34a3 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" /*##### # Support for Quest 925: Cairne's Hoofprint diff --git a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp index 929a540ccd..10d8c8a0f1 100644 --- a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp @@ -28,10 +28,10 @@ npc_ringo EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedFollowerAI.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 ca64cc75b2..de140123c4 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -29,10 +29,10 @@ go_elune_fire EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "WorldSession.h" // Theirs diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index b026e41995..9d6158586f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "azjol_nerub.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "azjol_nerub.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 02364327ad..0dcb909e62 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "azjol_nerub.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" +#include "azjol_nerub.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 277b6d7483..319270b84c 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "azjol_nerub.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "azjol_nerub.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 61cd72c987..a97165bb91 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "azjol_nerub.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "azjol_nerub.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 a44f353ba5..cf41adc7ca 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "ahnkahet.h" -#include "Player.h" #include "SpellScript.h" +#include "ahnkahet.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 3ad3a5c099..907c308e0c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "Containers.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "ahnkahet.h" #include "SpellAuras.h" #include "SpellScript.h" -#include "Containers.h" +#include "ahnkahet.h" enum Misc { 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 06f8b2c851..012fb8416b 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "ahnkahet.h" -#include "Player.h" #include "SpellInfo.h" #include "SpellScript.h" +#include "ahnkahet.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 cfced9fe35..6f917563c6 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -15,14 +15,14 @@ * with this program. If not, see . */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ahnkahet.h" #include "Containers.h" #include "ObjectAccessor.h" -#include "SpellScript.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" #include "TemporarySummon.h" +#include "ahnkahet.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 0b3078702c..28058bcbe9 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ +#include "PassiveAI.h" +#include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "ahnkahet.h" #include "SpellInfo.h" #include "SpellScript.h" -#include "Player.h" -#include "PassiveAI.h" +#include "ahnkahet.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 511f13b4d8..bc2283d8f7 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "ahnkahet.h" -#include "Player.h" #include "SpellScript.h" +#include "ahnkahet.h" #include 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 54ce48d15e..4fda339bca 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "obsidian_sanctum.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "SpellScript.h" +#include "obsidian_sanctum.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 6740b6fc07..5edc7b053f 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -16,10 +16,10 @@ */ #include "CreatureAIImpl.h" -#include "obsidian_sanctum.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "obsidian_sanctum.h" class instance_obsidian_sanctum : public InstanceMapScript { 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 b6a711089d..4d714d94a2 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 @@ -16,10 +16,10 @@ */ #include "ObjectMgr.h" -#include "ruby_sanctum.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" +#include "ruby_sanctum.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 d2377923c9..c5623d7e30 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "ruby_sanctum.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" +#include "ruby_sanctum.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 fac4f44730..0ac8cab793 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -18,13 +18,14 @@ #include "GameObjectAI.h" #include "MapMgr.h" #include "Player.h" -#include "ruby_sanctum.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "Vehicle.h" +#include "WorldSession.h" +#include "ruby_sanctum.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 7f52760701..abba544d7e 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "ruby_sanctum.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "ruby_sanctum.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 0cb2658907..4974866b47 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -17,10 +17,10 @@ #include "InstanceScript.h" #include "Player.h" -#include "ruby_sanctum.h" #include "ScriptMgr.h" #include "TemporarySummon.h" #include "WorldPacket.h" +#include "ruby_sanctum.h" DoorData const doorData[] = { 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 43fc650734..7b1ae0e94d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" #include "SpellScript.h" #include "trial_of_the_champion.h" 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 6dc26aa1ce..b16ddaa0d3 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" #include "SpellInfo.h" #include "trial_of_the_champion.h" 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 f33a6cb716..4705e9dc96 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -17,12 +17,12 @@ #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" #include "SpellInfo.h" -#include "trial_of_the_champion.h" #include "Vehicle.h" +#include "trial_of_the_champion.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 734005978d..4c7a90d60e 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 @@ -17,10 +17,10 @@ #include "Group.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "trial_of_the_champion.h" +#include "ScriptedCreature.h" #include "Vehicle.h" +#include "trial_of_the_champion.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 f6b7851f2d..2e32867039 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 @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "trial_of_the_champion.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" -#include "trial_of_the_champion.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 0fc43721ae..b3a64132fe 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -17,8 +17,8 @@ #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" #include "trial_of_the_crusader.h" 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 dc1eb71750..a3ad1129b4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" #include "trial_of_the_crusader.h" 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 861974b5dd..f4dfa41d66 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "SpellScript.h" #include "trial_of_the_crusader.h" 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 d8e4d1cf52..39b0c18378 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -16,10 +16,10 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "trial_of_the_crusader.h" +#include "ScriptedCreature.h" #include "Vehicle.h" +#include "trial_of_the_crusader.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 23df499d15..5b357230b6 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -21,9 +21,9 @@ #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" #include "trial_of_the_crusader.h" 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 ff31e18040..74cc7eb41c 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 @@ -17,8 +17,8 @@ #include "Group.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "trial_of_the_crusader.h" #define CLEANUP_CHECK_INTERVAL 5000 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 011134c355..00d527e839 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 @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "trial_of_the_crusader.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" -#include "trial_of_the_crusader.h" enum MenuTexts { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h index 449c837c92..1acb10e7cb 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h @@ -18,9 +18,9 @@ #ifndef DEF_CRUSADER_H #define DEF_CRUSADER_H +#include "CreatureAIImpl.h" #include "GridNotifiers.h" #include "SpellAuraEffects.h" -#include "CreatureAIImpl.h" #define TrialOfTheCrusaderScriptName "instance_trial_of_the_crusader" diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 92b1c1c8ac..d000354753 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "drak_tharon_keep.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "drak_tharon_keep.h" enum Spells { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 592a66f3d2..acde0dd2c5 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "drak_tharon_keep.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "drak_tharon_keep.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 da33274afa..6705263362 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "drak_tharon_keep.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "drak_tharon_keep.h" enum Yells { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 1bb2bbedb1..bc728f11d3 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "drak_tharon_keep.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" +#include "drak_tharon_keep.h" enum Yells { 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 6c46c05894..c42018a110 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "drak_tharon_keep.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "drak_tharon_keep.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 9982f205ce..f3234af66d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ -#include "forge_of_souls.h" #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" +#include "forge_of_souls.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 b69a440fd0..e58674f89b 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 @@ -15,13 +15,13 @@ * with this program. If not, see . */ -#include "forge_of_souls.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" #include "SpellScript.h" +#include "forge_of_souls.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 46b5721b94..5414368ad5 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -17,9 +17,9 @@ #include "forge_of_souls.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellScript.h" enum Yells diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h index 2835280f00..353d4c3980 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h @@ -18,8 +18,8 @@ #ifndef DEF_FORGE_OF_SOULS_H #define DEF_FORGE_OF_SOULS_H -#include "GridNotifiers.h" #include "CreatureAIImpl.h" +#include "GridNotifiers.h" #define ForgeOfSoulsScriptName "instance_forge_of_souls" 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 3785c4bfc1..c94f13af94 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 @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "forge_of_souls.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "forge_of_souls.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 3c41321fd1..93fd62c601 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -21,9 +21,9 @@ #include "CreatureAIImpl.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellAuras.h" #include "SpellScript.h" 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 80494b1382..46d5dd654d 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "halls_of_reflection.h" #include "MapMgr.h" #include "Transport.h" +#include "halls_of_reflection.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 8a6a024fe7..6ddffadf36 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -17,13 +17,13 @@ #include "CreatureGroups.h" #include "Opcodes.h" -#include "pit_of_saron.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "SpellScript.h" #include "WorldSession.h" +#include "pit_of_saron.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 206684c304..1b789a0e3b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -17,14 +17,14 @@ #include "Opcodes.h" #include "PassiveAI.h" -#include "pit_of_saron.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "Vehicle.h" #include "WorldSession.h" +#include "pit_of_saron.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 90c9d40853..be8f81e38d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "pit_of_saron.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Vehicle.h" +#include "pit_of_saron.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 395d3e527e..5468da53e7 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 @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "pit_of_saron.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "pit_of_saron.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 dc52ea3a99..c1e591d56c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ +#include "pit_of_saron.h" #include "CreatureGroups.h" #include "MapMgr.h" #include "PassiveAI.h" -#include "pit_of_saron.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SmartAI.h" #include "SpellAuraEffects.h" #include "SpellScript.h" diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 3e1fbb912d..a3789633b3 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "gundrak.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "gundrak.h" enum Spells { diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 2ac4bd9737..ffd298587f 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "gundrak.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "gundrak.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 6404a840f1..6f65a6bc85 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "gundrak.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "gundrak.h" enum Spells { diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index dee3cbda41..2f03559d4d 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "gundrak.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "gundrak.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 4509c09532..1998352b48 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "gundrak.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "gundrak.h" enum Spells { diff --git a/src/server/scripts/Northrend/Gundrak/gundrak.h b/src/server/scripts/Northrend/Gundrak/gundrak.h index 7324de734a..90b8932a7e 100644 --- a/src/server/scripts/Northrend/Gundrak/gundrak.h +++ b/src/server/scripts/Northrend/Gundrak/gundrak.h @@ -18,8 +18,8 @@ #ifndef DEF_GUNDRAK_H #define DEF_GUNDRAK_H -#include "SpellScript.h" #include "CreatureAIImpl.h" +#include "SpellScript.h" #define GundrakScriptName "instance_gundrak" diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 13a2a71d40..8c72e14d6f 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "gundrak.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "gundrak.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 ced92a8b74..f9533522f8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ -#include "icecrown_citadel.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" +#include "icecrown_citadel.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 57876fef3c..733bbe04fd 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 @@ -16,12 +16,12 @@ */ #include "GridNotifiers.h" -#include "icecrown_citadel.h" #include "ObjectMgr.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" +#include "icecrown_citadel.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 dc78adafea..85bb64b0e2 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ -#include "icecrown_citadel.h" #include "ObjectMgr.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuras.h" +#include "icecrown_citadel.h" enum ScriptTexts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 75f8661432..278854beca 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "icecrown_citadel.h" #include "ObjectMgr.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" +#include "icecrown_citadel.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 2629d73b4d..3c0afa64cb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -16,7 +16,6 @@ */ #include "CreatureTextMgr.h" -#include "icecrown_citadel.h" #include "MoveSpline.h" #include "MoveSplineInit.h" #include "ScriptMgr.h" @@ -24,6 +23,7 @@ #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 eb2fe2db31..5a66b35a0e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -16,12 +16,12 @@ */ #include "Group.h" -#include "icecrown_citadel.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" +#include "icecrown_citadel.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 4fa7f215b9..48f5672fad 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -15,15 +15,15 @@ * with this program. If not, see . */ -#include "icecrown_citadel.h" #include "MapMgr.h" #include "ObjectMgr.h" #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "Vehicle.h" +#include "icecrown_citadel.h" #include enum ScriptTexts @@ -71,7 +71,7 @@ enum Events uint32 const boneSpikeSummonId[3] = {69062, 72669, 72670}; -struct BoneStormMoveTargetSelector : public Acore::unary_function +struct BoneStormMoveTargetSelector { public: BoneStormMoveTargetSelector(Creature* source) : _source(source) { } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index d89ca38a62..eee32e5e0d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -17,13 +17,13 @@ #include "GridNotifiers.h" #include "Group.h" -#include "icecrown_citadel.h" #include "ObjectMgr.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" #include "Vehicle.h" +#include "icecrown_citadel.h" enum ScriptTexts { @@ -201,10 +201,10 @@ private: }; // xinef: malleable goo selector, check for target validity -struct MalleableGooSelector : public Acore::unary_function +struct MalleableGooSelector { - const Unit* me; - MalleableGooSelector(Unit const* unit) : me(unit) {} +public: + MalleableGooSelector(Unit const* unit) : me(unit) { } bool operator()(Unit const* target) const { @@ -216,6 +216,8 @@ struct MalleableGooSelector : public Acore::unary_function return me->IsValidAttackTarget(target); } +private: + const Unit* me; }; class boss_professor_putricide : public CreatureScript diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 4966009ee7..202c357064 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -16,11 +16,11 @@ */ #include "GridNotifiers.h" -#include "icecrown_citadel.h" #include "ObjectMgr.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" +#include "icecrown_citadel.h" enum Texts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 9283d0f354..71e3036683 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -16,11 +16,11 @@ */ #include "GridNotifiers.h" -#include "icecrown_citadel.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "icecrown_citadel.h" enum Texts { @@ -237,7 +237,7 @@ private: ObjectGuid _sindragosaGUID; }; -struct LastPhaseIceTombTargetSelector : public Acore::unary_function +struct LastPhaseIceTombTargetSelector { public: LastPhaseIceTombTargetSelector(Creature* source) : _source(source) { } 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 04240c8966..6d1c895bfd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -20,15 +20,15 @@ #include "CreatureTextMgr.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "icecrown_citadel.h" #include "ObjectMgr.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "Unit.h" #include "Vehicle.h" +#include "icecrown_citadel.h" enum Texts { @@ -370,7 +370,7 @@ void SendPacketToPlayers(WorldPacket const* data, Unit* source) player->GetSession()->SendPacket(data); } -struct ShadowTrapLKTargetSelector : public Acore::unary_function +struct ShadowTrapLKTargetSelector { public: ShadowTrapLKTargetSelector(Creature* source, bool playerOnly = true, bool reqLOS = false, float maxDist = 0.0f) : _source(source), _playerOnly(playerOnly), _reqLOS(reqLOS), _maxDist(maxDist) { } @@ -396,7 +396,7 @@ private: float _maxDist; }; -struct NonTankLKTargetSelector : public Acore::unary_function +struct NonTankLKTargetSelector { public: NonTankLKTargetSelector(Creature* source, bool playerOnly = true, bool reqLOS = false, float maxDist = 0.0f, uint32 exclude1 = 0, uint32 exclude2 = 0) : _source(source), _playerOnly(playerOnly), _reqLOS(reqLOS), _maxDist(maxDist), _exclude1(exclude1), _exclude2(exclude2) { } @@ -430,7 +430,7 @@ private: uint32 _exclude2; }; -struct DefileTargetSelector : public Acore::unary_function +struct DefileTargetSelector { public: DefileTargetSelector(Creature* source) : _source(source) { } @@ -587,7 +587,7 @@ private: Creature& _owner; }; -class NecroticPlagueTargetCheck : public Acore::unary_function +class NecroticPlagueTargetCheck { public: NecroticPlagueTargetCheck(Unit const* obj, uint32 notAura1, uint32 notAura2) : _sourceObj(obj), _notAura1(notAura1), _notAura2(notAura2) {} diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 078aedd44e..d41b002ed7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -19,11 +19,11 @@ #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "icecrown_citadel.h" #include "ObjectMgr.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" +#include "icecrown_citadel.h" enum Texts { @@ -157,8 +157,9 @@ public: } }; -struct ManaVoidSelector : public Acore::unary_function +struct ManaVoidSelector { +public: explicit ManaVoidSelector(WorldObject const* source) : _source(source) { } bool operator()(Unit* unit) const @@ -166,6 +167,7 @@ struct ManaVoidSelector : public Acore::unary_function return unit->getPowerType() == POWER_MANA && _source->GetDistance(unit) > 15.0f; } +private: WorldObject const* _source; }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 2e4a9bea4e..55b90a4797 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -15,18 +15,18 @@ * with this program. If not, see . */ +#include "icecrown_citadel.h" #include "AccountMgr.h" #include "Cell.h" #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "Group.h" -#include "icecrown_citadel.h" #include "ObjectMgr.h" #include "PassiveAI.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" #include "SmartAI.h" #include "SpellAuraEffects.h" diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp index 403637b276..fa786f5b75 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ -#include "icecrown_citadel.h" #include "InstanceScript.h" #include "Player.h" -#include "ScriptedGossip.h" #include "ScriptMgr.h" +#include "ScriptedGossip.h" #include "Spell.h" +#include "icecrown_citadel.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 63fbdae3e9..7128199353 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -18,16 +18,16 @@ #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 "ScriptedCreature.h" #include "Transport.h" #include "WorldPacket.h" #include "WorldSession.h" +#include "icecrown_citadel.h" enum EventIds { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index da74e4f7f8..d744c77443 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "naxxramas.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "naxxramas.h" enum Says { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index e9a07a5880..dc12254518 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "naxxramas.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" +#include "naxxramas.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 b1ec6c8de3..2b83e104fa 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ -#include "naxxramas.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" +#include "naxxramas.h" enum Spells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 0d7e889415..de26c3e9c8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "naxxramas.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "naxxramas.h" enum Spells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 8167503d51..4081eadadf 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -17,10 +17,10 @@ #include "CombatAI.h" #include "GridNotifiers.h" -#include "naxxramas.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "naxxramas.h" enum Yells { @@ -173,15 +173,18 @@ const Position PosSummonDead[5] = #define IN_LIVE_SIDE(who) (who->GetPositionY() < POS_Y_GATE) // Predicate function to check that the r efzr unit is NOT on the same side as the source. -struct NotOnSameSide : public Acore::unary_function +struct NotOnSameSide { - bool m_inLiveSide; - explicit NotOnSameSide(Unit* pSource) : m_inLiveSide(IN_LIVE_SIDE(pSource)) {} +public: + explicit NotOnSameSide(Unit* pSource) : m_inLiveSide(IN_LIVE_SIDE(pSource)) { } bool operator() (const Unit* pTarget) { return (m_inLiveSide != IN_LIVE_SIDE(pTarget)); } + +private: + bool m_inLiveSide; }; class boss_gothik : public CreatureScript diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index f08033ee8e..fb8d9ddfd6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ -#include "naxxramas.h" #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "SpellScript.h" -#include "SpellAuras.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellScript.h" +#include "naxxramas.h" enum Spells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index e2116d3449..bbe385478b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "naxxramas.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "naxxramas.h" enum Says { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 30a5614582..f4c8a1b4e2 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "naxxramas.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "naxxramas.h" enum Yells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 8221d5a7a1..ef41b0444d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "naxxramas.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "naxxramas.h" enum Spells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index f0a293f3be..427d5b0f1d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "naxxramas.h" #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "naxxramas.h" enum Spells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 36dcbb8ded..88c2f8b974 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "naxxramas.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "naxxramas.h" enum Says { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index ab1f3d82fb..c9d2fce994 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "naxxramas.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "naxxramas.h" enum Yells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 4e4d550164..7e8abfd92a 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "naxxramas.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "naxxramas.h" enum Says { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 8bc2ac8828..62b07057c3 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "naxxramas.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "naxxramas.h" enum Yells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 63f28cc165..4381e3c97d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "naxxramas.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "naxxramas.h" enum Says { diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index d51c363837..5b52d8a458 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -18,10 +18,10 @@ #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" -#include "naxxramas.h" #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "naxxramas.h" const float HeiganPos[2] = {2796, -3707}; const float HeiganEruptionSlope[3] = diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h index fac8a1377c..ed4425b0d5 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h @@ -18,8 +18,8 @@ #ifndef DEF_NAXXRAMAS_H #define DEF_NAXXRAMAS_H -#include "SpellScript.h" #include "CreatureAIImpl.h" +#include "SpellScript.h" #define NaxxramasScriptName "instance_naxxramas" diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 4890baa35d..aad4a61488 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -16,17 +16,17 @@ */ #include "CombatAI.h" -#include "eye_of_eternity.h" #include "MoveSpline.h" #include "MoveSplineInit.h" #include "Opcodes.h" #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" #include "Vehicle.h" #include "WorldSession.h" +#include "eye_of_eternity.h" enum MovementInformPoints { 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 74f6b7ff2d..ed593811c2 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 @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "eye_of_eternity.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Vehicle.h" +#include "eye_of_eternity.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 28cf2c8d39..bc7e03ff72 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "nexus.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" +#include "nexus.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 553f4bb910..12b549d6a3 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "nexus.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "nexus.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 dfb1268366..6d2f5be383 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -16,9 +16,9 @@ * with this program. If not, see . */ -#include "nexus.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "nexus.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 680bdf457d..6418ac84a6 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "nexus.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "nexus.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 d521290a7f..2441ffa19c 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "nexus.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "nexus.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 fe9d734476..fc19d1c7f8 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "nexus.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "nexus.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 3cd75bfefc..a952bf6d7e 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "oculus.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "oculus.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 727f9647e8..71ed678bd3 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "oculus.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "oculus.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 e8f5fdf041..e7fdacaee0 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "oculus.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" +#include "oculus.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 e21aa8bca2..5c75154291 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "oculus.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "oculus.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 d0894d7db0..5c4a802bd8 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -17,10 +17,10 @@ #include "Group.h" #include "LFGMgr.h" -#include "oculus.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "oculus.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 8a965432ba..36e9deae0a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -15,15 +15,15 @@ * with this program. If not, see . */ +#include "oculus.h" #include "CombatAI.h" #include "InstanceScript.h" #include "MotionMaster.h" #include "ObjectAccessor.h" -#include "oculus.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellInfo.h" #include "SpellScript.h" diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 6f215167ab..ba8c9de951 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "halls_of_lightning.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" +#include "halls_of_lightning.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 2dad3f3081..013004664d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "halls_of_lightning.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" +#include "halls_of_lightning.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 b010de0166..b43cfbe098 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "halls_of_lightning.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "halls_of_lightning.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 f1fac2841a..258ce3a5cd 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "halls_of_lightning.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" +#include "halls_of_lightning.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 185a37affe..b79fe2e03a 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "halls_of_lightning.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "halls_of_lightning.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 ca582e281d..9142e3d0f9 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "halls_of_stone.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "halls_of_stone.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 341530b06b..d3d662409f 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "halls_of_stone.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "halls_of_stone.h" enum spells { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index f1f6d20075..94aaa32dce 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "halls_of_stone.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "halls_of_stone.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 9e8a92d817..2264e9f85b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ -#include "halls_of_stone.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellScript.h" +#include "halls_of_stone.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 37195206e7..5840bca6c8 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "halls_of_stone.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "halls_of_stone.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 650160d3b0..a18effa322 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 @@ -21,8 +21,8 @@ #include "ObjectMgr.h" #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" #include "ulduar.h" 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 fed6159e49..f65e710d20 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 @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "ulduar.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index 21a322abf7..018f48db15 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "ulduar.h" 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 a752241a60..649455592c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -20,16 +20,16 @@ #include "Opcodes.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.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 "ulduar.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 58c1fe3a8a..05b3ce9db5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -17,8 +17,8 @@ #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "ulduar.h" 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 4139cfabc1..a6d17e8177 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -19,11 +19,11 @@ #include "BanMgr.h" #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" -#include "ulduar.h" #include "WorldSession.h" +#include "ulduar.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 8a62c0296c..9753bca6ac 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -17,8 +17,8 @@ #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellAuras.h" #include "SpellScript.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 1886cd068d..764e1eea63 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -16,13 +16,13 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellAuras.h" #include "SpellScript.h" -#include "ulduar.h" #include "Vehicle.h" +#include "ulduar.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 a7d5c5468e..3b6e910ebb 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -17,12 +17,12 @@ #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" -#include "ulduar.h" #include "Vehicle.h" +#include "ulduar.h" enum KologarnSays { @@ -648,7 +648,7 @@ public: }; // predicate function to select non main tank target -class StoneGripTargetSelector : public Acore::unary_function +class StoneGripTargetSelector { public: StoneGripTargetSelector(Creature* me, Unit const* victim) : _me(me), _victim(victim) {} @@ -664,6 +664,7 @@ public: return false; } +private: Creature* _me; Unit const* _victim; }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 98dd3649ba..fd4357261d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -18,13 +18,13 @@ #include "MapMgr.h" #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" #include "SpellScript.h" -#include "ulduar.h" #include "Vehicle.h" +#include "ulduar.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 4d90432250..84d67803fa 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -17,13 +17,13 @@ #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" -#include "ulduar.h" #include "WaypointMgr.h" +#include "ulduar.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 d386a78d44..c5861c7f01 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -17,9 +17,9 @@ #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "ulduar.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 664179176d..cf91e07a45 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -18,12 +18,12 @@ #include "Opcodes.h" #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" -#include "ulduar.h" #include "Vehicle.h" +#include "ulduar.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 7818fd63d1..be20f5ddd3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp @@ -20,9 +20,9 @@ #include "Opcodes.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" #include "ulduar.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 25d477d70c..ced3d0467a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -16,13 +16,13 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Transport.h" -#include "ulduar.h" #include "Vehicle.h" #include "WorldPacket.h" #include "WorldSession.h" +#include "ulduar.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 864fcab10b..fb1509ec64 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ +#include "ulduar.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" -#include "ulduar.h" class npc_ulduar_keeper : public CreatureScript { 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 0798a497d5..bae8630214 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 @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 bae881fc42..54bb5fb10a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -16,8 +16,8 @@ */ #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "utgarde_keep.h" 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 af16e000ec..0606cd4fcd 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 2542152467..b492f34680 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 ed2cb0b092..9cebba4dfb 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "GameObjectAI.h" -#include "ScriptedCreature.h" -#include "ScriptMgr.h" #include "utgarde_keep.h" +#include "GameObjectAI.h" +#include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Vehicle.h" class npc_dragonflayer_forge_master : public CreatureScript diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h index 467f30f231..288a247725 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h @@ -18,8 +18,8 @@ #ifndef DEF_UTGARDE_KEEP_H #define DEF_UTGARDE_KEEP_H -#include "SpellScript.h" #include "CreatureAIImpl.h" +#include "SpellScript.h" #define UtgardeKeepScriptName "instance_utgarde_keep" diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 8b0ed208cc..bc487a8377 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 578e10182b..f4bbb5b88d 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -17,11 +17,11 @@ #include "CombatAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" -#include "utgarde_pinnacle.h" #include "Vehicle.h" +#include "utgarde_pinnacle.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 a20f8ad544..a28ed7e20a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -17,8 +17,8 @@ #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" #include "utgarde_pinnacle.h" diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 072e1bbfb4..452b6bfe80 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "utgarde_pinnacle.h" 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 0c99227ffc..bce4d4370c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "utgarde_pinnacle.h" class instance_utgarde_pinnacle : public InstanceMapScript diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h index 416cd9cb49..d39a95dc1b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h @@ -18,8 +18,8 @@ #ifndef DEF_PINNACLE_H #define DEF_PINNACLE_H -#include "Opcodes.h" #include "CreatureAIImpl.h" +#include "Opcodes.h" #define UtgardePinnacleScriptName "instance_utgarde_pinnacle" diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 6fbd488c66..b593659ffb 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "SpellScript.h" #include "vault_of_archavon.h" diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 6ae1c1404f..0c888ee0a5 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "SpellScript.h" #include "vault_of_archavon.h" diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 02f5b1ce42..5391bcc0f9 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "SpellScript.h" #include "vault_of_archavon.h" diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index d1d04043cf..2d9f8deb54 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -17,8 +17,8 @@ #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "vault_of_archavon.h" 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 9010eab919..ba480aacd3 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -18,8 +18,8 @@ #include "Battlefield.h" #include "BattlefieldMgr.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "vault_of_archavon.h" diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index ca88878609..71956b98d6 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "violet_hold.h" diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 1283f2d623..834b5c69e3 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 4ad500f6d1..a0d2ae77d4 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "violet_hold.h" diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index a7317dc758..fb59d658c4 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 a4668ea98a..29b6c5e402 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "violet_hold.h" diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 18cfe908b0..56559dcf93 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 ad4a0efe33..b0be3da7a0 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -16,8 +16,8 @@ */ #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 7b941c6de5..1a0f0af566 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "violet_hold.h" #define CLEANUP_CHECK_INTERVAL 5000 diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index d9cc177a04..ccf11d836d 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -15,14 +15,14 @@ * with this program. If not, see . */ +#include "violet_hold.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.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 6121f8b5be..25c6415167 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -19,8 +19,8 @@ #include "CombatAI.h" #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "SpellScript.h" diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 2443dd9fb6..f54b1e8be9 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -35,16 +35,15 @@ EndContentData */ #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedFollowerAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellInfo.h" #include "SpellScript.h" #include "WorldSession.h" -#include "ScriptedGossip.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 4930a68237..02646aadce 100644 --- a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp @@ -25,8 +25,8 @@ Script Data End */ #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SmartScriptMgr.h" #include "Transport.h" #include "Vehicle.h" diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 560309a73f..6ebcf08b4b 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -24,9 +24,9 @@ SDCategory: Dalaran Script Data End */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "World.h" // Ours diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 6e2c8c39de..e4506a1720 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -29,11 +29,12 @@ EndContentData */ #include "Chat.h" #include "CombatAI.h" #include "CreatureTextMgr.h" +#include "GridNotifiersImpl.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" #include "Vehicle.h" diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index bed9db3324..184cac66a3 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -19,12 +19,11 @@ #include "CreatureTextMgr.h" #include "Pet.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" #include "SpellInfo.h" #include "SpellScript.h" -#include "CombatAI.h" // Theirs diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 17cd6656ab..802193cf57 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -29,10 +29,10 @@ EndContentData */ #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.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 d4ab7ebf90..06a5cfb47e 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -30,10 +30,10 @@ EndContentData */ #include "MoveSplineInit.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SmartScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 6344208c1f..c18d90fbcd 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -31,10 +31,10 @@ EndContentData */ #include "CombatAI.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" #include "Vehicle.h" diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index fc5a457816..45bd0d932f 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -17,10 +17,10 @@ #include "CombatAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "Vehicle.h" diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 4d994a0237..683591a04f 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -24,9 +24,9 @@ #include "ObjectMgr.h" #include "Player.h" #include "PoolMgr.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellScript.h" #include "Vehicle.h" #include "World.h" diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 7431acb691..ac5e0b5b21 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -18,10 +18,10 @@ #include "CombatAI.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellInfo.h" #include "Vehicle.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 156f364074..27bb601027 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ +#include "OutdoorPvPEP.h" #include "GameGraveyard.h" #include "GameObject.h" #include "Language.h" #include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" -#include "OutdoorPvPEP.h" #include "OutdoorPvPMgr.h" #include "Player.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp index b3a53c0d81..6339f6754b 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "OutdoorPvPGH.h" #include "GameEventMgr.h" #include "MapMgr.h" -#include "OutdoorPvPGH.h" #include "OutdoorPvPMgr.h" #include "Player.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index 53d155a133..47ac8c1e98 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ +#include "OutdoorPvPHP.h" #include "Language.h" #include "MapMgr.h" #include "ObjectMgr.h" #include "OutdoorPvP.h" -#include "OutdoorPvPHP.h" #include "OutdoorPvPMgr.h" #include "Player.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 5a60f4967e..5c359cb7cf 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "OutdoorPvPNA.h" #include "GameGraveyard.h" -#include "MapMgr.h" #include "Language.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" -#include "OutdoorPvPNA.h" #include "Player.h" #include "ScriptMgr.h" #include "World.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index 619a1f9c28..db7b5dfa6f 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "OutdoorPvPSI.h" #include "GameObject.h" #include "Language.h" #include "MapMgr.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" -#include "OutdoorPvPSI.h" #include "Player.h" #include "ReputationMgr.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index 4da190570e..cb611c3ec8 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ +#include "OutdoorPvPTF.h" #include "Language.h" #include "MapMgr.h" #include "ObjectMgr.h" #include "OutdoorPvP.h" #include "OutdoorPvPMgr.h" -#include "OutdoorPvPTF.h" #include "Player.h" #include "ScriptMgr.h" #include "World.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index b669f0307e..78e7cc6eb2 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -15,12 +15,13 @@ * with this program. If not, see . */ +#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 "ScriptMgr.h" #include "World.h" 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 66f896a480..9b1dd3c493 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "auchenai_crypts.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "auchenai_crypts.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 09158c4fd2..d66ca5e721 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 @@ -15,12 +15,12 @@ * with this program. If not, see . */ -#include "auchenai_crypts.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" #include "SpellScript.h" +#include "auchenai_crypts.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 dc7a651897..f599201bb3 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 "auchenai_crypts.h" #include "InstanceScript.h" #include "Map.h" #include "ScriptMgr.h" +#include "auchenai_crypts.h" class instance_auchenai_crypts : public InstanceMapScript { diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index b7b0bb1684..d2b8124691 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "Player.h" #include "mana_tombs.h" enum ePrince diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index da0db7d86b..7c7bcdcc2c 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "mana_tombs.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "mana_tombs.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 36e90ae816..55377d7666 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp @@ -16,9 +16,9 @@ */ #include "InstanceScript.h" -#include "mana_tombs.h" #include "Map.h" #include "ScriptMgr.h" +#include "mana_tombs.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 acdf6def9e..dd547eed81 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 @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "sethekk_halls.h" enum TailonkingIkiss 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 90e2f77055..d6aabb4e88 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ +#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 7334d90355..e1417b6ad2 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 @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 a342e8a72a..615a1d0979 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 90ba382e52..e469a4be9b 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "shadow_labyrinth.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" +#include "shadow_labyrinth.h" enum Murmur { diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 5c16373677..eef66696dd 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "black_temple.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "black_temple.h" enum Says { diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 2cb226f703..95df726259 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "black_temple.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptMgr.h" +#include "black_temple.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 316aafe730..b31f438eba 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "black_temple.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "black_temple.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 b25eec7c39..cf2e68fab9 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "black_temple.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" +#include "black_temple.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 9e5f14aa00..fec5e1596b 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "black_temple.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "black_temple.h" enum Says { diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 8108c5295b..7ae7772862 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "black_temple.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "black_temple.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 356a575903..a52ab53b83 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "black_temple.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "black_temple.h" enum Says { @@ -62,7 +62,7 @@ enum Misc EVENT_TALK_KILL = 10 }; -struct ShadowOfDeathSelector : public Acore::unary_function +struct ShadowOfDeathSelector { bool operator()(Unit const* target) const { diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 0ad759466e..8cd549da62 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "black_temple.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "black_temple.h" enum Yells { diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index d0e2c52739..99bf58b728 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "black_temple.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "black_temple.h" enum Says { @@ -99,15 +99,18 @@ enum Misc EVENT_KILL_TALK = 100 }; -struct HammerOfJusticeSelector : public Acore::unary_function +struct HammerOfJusticeSelector { - Unit const* _me; +public: HammerOfJusticeSelector(Unit* me) : _me(me) { } bool operator()(Unit const* target) const { return target && target->GetTypeId() == TYPEID_PLAYER && _me->IsInRange(target, 10.0f, 40.0f, true); } + +private: + Unit const* _me; }; class VerasEnvenom : public BasicEvent diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 94c0e35fda..c7cd0203a5 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "black_temple.h" #include "InstanceScript.h" #include "ScriptMgr.h" +#include "black_temple.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 8830e96660..a5ee3b9616 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 574dd88f77..0584e7498d 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 @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 53527200a0..07095f3661 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -16,11 +16,11 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "serpent_shrine.h" +#include "ScriptedCreature.h" #include "Spell.h" #include "WorldSession.h" +#include "serpent_shrine.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 43f2f2fee2..a709cf9924 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 @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 e52497c309..aa6697e4a8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 cb9fa11afb..479fc24ced 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 9c932065b3..adcee2fe81 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -18,8 +18,8 @@ #include "InstanceScript.h" #include "Player.h" #include "ScriptMgr.h" -#include "serpent_shrine.h" #include "TemporarySummon.h" +#include "serpent_shrine.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp index cf57625fda..875d465762 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp @@ -19,9 +19,9 @@ #include "LFGMgr.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "the_slave_pens.h" #define GOSSIP_TEXT_ID 15864 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 9f73845228..ae459d8ef1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 0f575b974c..f54a19e8f8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 06fc65a88d..27ec6e5793 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "steam_vault.h" diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h index d8fc202162..73e2b8d5cf 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h @@ -18,8 +18,8 @@ #ifndef DEF_STEAM_VAULT_H #define DEF_STEAM_VAULT_H -#include "PassiveAI.h" #include "CreatureAIImpl.h" +#include "PassiveAI.h" #define SteamVaultScriptName "instance_steam_vault" 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 82c82d0756..b99af06c0a 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 @@ -22,8 +22,8 @@ SDComment: Timers may be incorrect SDCategory: Coilfang Resevoir, Underbog EndScriptData */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" #include "the_underbog.h" diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 8977abb431..d4f5adeb0f 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "gruuls_lair.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "gruuls_lair.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 3a5f7d21f7..cc8da5f0bb 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "gruuls_lair.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "gruuls_lair.h" enum HighKingMaulgar { diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index 2c56d0bb29..0f84f4e66c 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "gruuls_lair.h" #include "InstanceScript.h" #include "ScriptMgr.h" +#include "gruuls_lair.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h index eee7e1f93c..af0ef54fba 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h @@ -18,8 +18,8 @@ #ifndef DEF_BLOOD_FURNACE_H #define DEF_BLOOD_FURNACE_H -#include "Player.h" #include "CreatureAIImpl.h" +#include "Player.h" #define BloodFurnaceScriptName "instance_blood_furnace" diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index f21dc0e79a..af31a23163 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "blood_furnace.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" +#include "blood_furnace.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 65b8a5951f..5e0486a766 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 @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "blood_furnace.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuras.h" +#include "blood_furnace.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 c0648c9ff6..e169c8f975 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "blood_furnace.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "blood_furnace.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 b1f840c370..ba5703310d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "blood_furnace.h" #include "CreatureAI.h" #include "InstanceScript.h" #include "ScriptMgr.h" +#include "blood_furnace.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 6b2e55dd84..68e810db8d 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "hellfire_ramparts.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "hellfire_ramparts.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 0711b52051..88b961ecae 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "hellfire_ramparts.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "hellfire_ramparts.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 ea080e7315..50b4754f7d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "hellfire_ramparts.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "hellfire_ramparts.h" enum Says { diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h index bb80e8e33e..834fb1e8d6 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h @@ -18,8 +18,8 @@ #ifndef DEF_RAMPARTS_H #define DEF_RAMPARTS_H -#include "SpellScript.h" #include "CreatureAIImpl.h" +#include "SpellScript.h" #define HellfireRampartsScriptName "instance_hellfire_ramparts" 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 c3dceadfef..ab45b91d26 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "hellfire_ramparts.h" #include "InstanceScript.h" #include "ScriptMgr.h" +#include "hellfire_ramparts.h" class instance_hellfire_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 e8b19d317c..f767a4b83f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -15,10 +15,10 @@ * with this program. If not, see . */ -#include "magtheridons_lair.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" +#include "magtheridons_lair.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 008ed9025d..c60fa954a3 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -16,9 +16,9 @@ */ #include "InstanceScript.h" -#include "magtheridons_lair.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "magtheridons_lair.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h index 20d58765be..3eef4674f1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h @@ -18,8 +18,8 @@ #ifndef DEF_MAGTHERIDONS_LAIR_H #define DEF_MAGTHERIDONS_LAIR_H -#include "SpellScript.h" #include "CreatureAIImpl.h" +#include "SpellScript.h" #define MagtheridonsLairScriptName "instance_magtheridons_lair" diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 824dd58c78..e8eb545812 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -16,8 +16,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 cf6e8f5e5e..9194fadbb9 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 c1e95b965e..4de8755fc2 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 @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "shattered_halls.h" enum Says diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index b1797a5220..37adabc406 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -16,10 +16,10 @@ */ #include "MoveSplineInit.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "the_eye.h" +#include "ScriptedCreature.h" #include "WaypointMgr.h" +#include "the_eye.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 02f7c1ffd1..0dd5beb122 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -16,10 +16,10 @@ */ #include "Opcodes.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "the_eye.h" +#include "ScriptedCreature.h" #include "WorldPacket.h" +#include "the_eye.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 7bd7507329..03974ba624 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "the_eye.h" enum voidReaver 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 d733f7098f..c88c47dce5 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "mechanar.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "mechanar.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 ef5654e6a2..b8ba6d8c6a 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "mechanar.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "mechanar.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 c4ed5ac5d4..0ff8456337 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 @@ -15,11 +15,11 @@ * with this program. If not, see . */ -#include "mechanar.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" +#include "mechanar.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 339dd3d6aa..682d47f4a6 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "mechanar.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "mechanar.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 c7cb532926..96a129b4ae 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "mechanar.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "mechanar.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 2c51b3dfe0..bc5fda4450 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -16,8 +16,8 @@ */ #include "InstanceScript.h" -#include "mechanar.h" #include "ScriptMgr.h" +#include "mechanar.h" static DoorData const doorData[] = { diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index ad048d4df0..08c7b0b693 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -16,8 +16,8 @@ */ #include "arcatraz.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" enum MillhouseSays { 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 2827295a48..d4faf9f4cb 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "arcatraz.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "arcatraz.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 58b8402640..81247ecc5b 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "arcatraz.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "arcatraz.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 856c01504c..1ddbb42373 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "arcatraz.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "arcatraz.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 0a20c9c822..d93d72cd25 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 @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "arcatraz.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" +#include "arcatraz.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 81b329a002..a11bdb9229 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "arcatraz.h" #include "InstanceScript.h" #include "ScriptMgr.h" +#include "arcatraz.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 b409866f63..924e11a07b 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellScript.h" #include "the_botanica.h" 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 b8fa6d7905..d046864c1f 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 @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 93c41fbbef..d898f13ce7 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 eaa969217e..76f8c4355f 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 @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 e29edb8bed..4d406aa526 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "the_botanica.h" enum Says diff --git a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h index 3e54a68d26..ad6449eb7c 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h +++ b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h @@ -18,8 +18,8 @@ #ifndef DEF_THE_BOTANICA_H #define DEF_THE_BOTANICA_H -#include "SpellScript.h" #include "CreatureAIImpl.h" +#include "SpellScript.h" #define TheBotanicaScriptName "instance_the_botanica" diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index e021f416a3..1e9dae6d71 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 d878b6fc1c..6f58632157 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 c74ccf63ca..d3ea149214 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -32,9 +32,9 @@ EndContentData */ #include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellAuras.h" #include "SpellInfo.h" diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index d9a1446961..bb0163cadb 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -30,10 +30,10 @@ npc_fel_guard_hound EndContentData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellScript.h" #include "WorldSession.h" diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index ec78eedf58..ddd3697216 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -28,10 +28,10 @@ npc_creditmarker_visit_with_ancestors EndContentData */ #include "Player.h" +#include "ScriptMgr.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 375f9c181c..b462602d91 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -31,10 +31,10 @@ EndContentData */ #include "GameObjectAI.h" #include "Player.h" +#include "ScriptMgr.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 7288822116..88129f7185 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -39,10 +39,10 @@ EndContentData */ #include "Group.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellScript.h" #include "WorldSession.h" diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index 84736e72f5..0941d9377b 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -32,10 +32,10 @@ npc_ishanah EndContentData */ #include "Player.h" +#include "ScriptMgr.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 838570b4ce..f07cf0eba8 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -34,10 +34,10 @@ EndContentData */ #include "Group.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" #include "WorldSession.h" diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index 39e3491728..a0a525496d 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -32,10 +32,10 @@ npc_timothy_daniels EndContentData */ #include "Player.h" +#include "ScriptMgr.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 8e4b6a04fc..312db264d2 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -24,9 +24,10 @@ #include "CellImpl.h" #include "CombatAI.h" #include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 149321df87..6ff2b8e9f4 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -24,9 +24,9 @@ #include "Group.h" #include "PassiveAI.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp index 7fdb75094d..b3a181999d 100644 --- a/src/server/scripts/Pet/pet_hunter.cpp +++ b/src/server/scripts/Pet/pet_hunter.cpp @@ -20,8 +20,8 @@ * Scriptnames of files in this file should be prefixed with "npc_pet_hun_". */ -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" enum HunterSpells { diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp index 89ed6a6992..5df9fcda54 100644 --- a/src/server/scripts/Pet/pet_mage.cpp +++ b/src/server/scripts/Pet/pet_mage.cpp @@ -23,8 +23,8 @@ #include "CombatAI.h" #include "Pet.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 d72b946209..1f6b2f9647 100644 --- a/src/server/scripts/Pet/pet_priest.cpp +++ b/src/server/scripts/Pet/pet_priest.cpp @@ -22,8 +22,8 @@ #include "PassiveAI.h" #include "PetAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 ef59732356..0e35ec68e3 100644 --- a/src/server/scripts/Pet/pet_shaman.cpp +++ b/src/server/scripts/Pet/pet_shaman.cpp @@ -21,8 +21,8 @@ */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" enum ShamanSpells { diff --git a/src/server/scripts/ScriptPCH.h b/src/server/scripts/ScriptPCH.h index 955cd057af..2f6934840f 100644 --- a/src/server/scripts/ScriptPCH.h +++ b/src/server/scripts/ScriptPCH.h @@ -31,9 +31,9 @@ #include "InstanceScript.h" #include "ObjectMgr.h" #include "PassiveAI.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "Unit.h" diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 3ebf87d33d..8956d7c29b 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -26,6 +26,7 @@ #include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellInfo.h" +#include "SpellMgr.h" #include "SpellScript.h" #include "Totem.h" #include "UnitAI.h" diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 45f741f520..5e16c81b89 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -26,6 +26,7 @@ #include "Player.h" #include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellMgr.h" #include "SpellScript.h" enum DruidSpells diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 3214aa2b66..026cbad65a 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -26,8 +26,9 @@ #include "GridNotifiers.h" #include "Pet.h" #include "ScriptMgr.h" -#include "SpellAuras.h" #include "SpellAuraEffects.h" +#include "SpellAuras.h" +#include "SpellMgr.h" #include "SpellScript.h" // TODO: this import is not necessary for compilation and marked as unused by the IDE diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index c32cab3614..e70d4df826 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -23,11 +23,12 @@ #include "Battleground.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SkillDiscovery.h" #include "SpellAuraEffects.h" #include "SpellScript.h" +#include "WorldSession.h" class spell_item_massive_seaforium_charge : public SpellScript { diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 0282ba7cc7..3335edd8b7 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -25,6 +25,7 @@ #include "Player.h" #include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellMgr.h" #include "SpellScript.h" #include "UnitAI.h" diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 86f75cd46f..32facf6e72 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -25,6 +25,7 @@ #include "Player.h" #include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellMgr.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 263551e7e8..4d62f713d5 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -25,8 +25,8 @@ #include "CreatureTextMgr.h" #include "GridNotifiers.h" #include "MapMgr.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellAuras.h" #include "SpellScript.h" diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 932162d8bd..26285e7e07 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -25,6 +25,7 @@ #include "GridNotifiers.h" #include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellMgr.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 2d3ce14ca2..5448eebe67 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -24,6 +24,7 @@ #include "GridNotifiers.h" #include "ScriptMgr.h" #include "SpellAuraEffects.h" +#include "SpellMgr.h" #include "SpellScript.h" #include "TemporarySummon.h" #include "Unit.h" diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 2d967be1a7..f6ec507670 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -25,6 +25,7 @@ #include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellInfo.h" +#include "SpellMgr.h" #include "SpellScript.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index ee94beb4c6..aa45f27b23 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -25,6 +25,7 @@ #include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellInfo.h" +#include "SpellMgr.h" #include "SpellScript.h" enum WarriorSpells diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 648b0b44fe..d60a4180d1 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -35,8 +35,8 @@ at_area_52_entrance EndContentData */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 e5245ea7ee..bbcf90b63a 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -18,8 +18,8 @@ #include "GridNotifiers.h" #include "ObjectMgr.h" #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" #include "SpellScript.h" diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 6a8089f2e5..4bd9faa84c 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -45,9 +45,9 @@ EndContentData */ #include "GameObjectAI.h" #include "GridNotifiersImpl.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "Spell.h" #include "WorldSession.h" diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index 3312bdb175..41a24c556d 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -30,8 +30,8 @@ EndContentData */ #include "GuardAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 0741881fba..95bc326350 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -30,8 +30,8 @@ item_only_for_flight Items which should only useable while flying EndContentData */ #include "Player.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.h" #include "Spell.h" /*##### diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index 277a325d10..f1091e2d7a 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -23,8 +23,8 @@ SDCategory: Creatures EndScriptData */ #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "ScriptMgr.h" +#include "ScriptedCreature.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 85e04c04b4..16aa871979 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -17,9 +17,10 @@ #include "GameEventMgr.h" #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" +#include "WorldSession.h" constexpr auto SPELL_TRICK = 24714; constexpr auto SPELL_TREAT = 24715; diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 0dbea0aeb3..ed767b6c95 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -23,9 +23,9 @@ SDCategory: NPCs EndScriptData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellInfo.h" #include "WorldSession.h" diff --git a/src/server/scripts/World/npc_stave_of_ancients.cpp b/src/server/scripts/World/npc_stave_of_ancients.cpp index dc269228ce..0e52049fea 100644 --- a/src/server/scripts/World/npc_stave_of_ancients.cpp +++ b/src/server/scripts/World/npc_stave_of_ancients.cpp @@ -15,13 +15,13 @@ * with this program. If not, see . */ +#include "npc_stave_of_ancients.h" #include "CreatureGroups.h" #include "Player.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "Spell.h" -#include "npc_stave_of_ancients.h" uint32 NPCStaveQuestAI::GetFormEntry(std::string type) { diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp index 1bffd76673..80d47ebf07 100644 --- a/src/server/scripts/World/npc_taxi.cpp +++ b/src/server/scripts/World/npc_taxi.cpp @@ -24,9 +24,9 @@ EndScriptData */ #include "Player.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "WorldSession.h" #define GOSSIP_NETHER_DRAKE "I'm ready to fly! Take me up, dragon!" diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 858586dc92..6570078409 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -49,10 +49,10 @@ EndContentData */ #include "ObjectMgr.h" #include "PassiveAI.h" #include "Pet.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SmartAI.h" #include "SpellAuras.h" #include "WaypointMgr.h" diff --git a/src/server/shared/DataStores/DBCDatabaseLoader.cpp b/src/server/shared/DataStores/DBCDatabaseLoader.cpp index 1bb4653820..a5fe55bbd2 100644 --- a/src/server/shared/DataStores/DBCDatabaseLoader.cpp +++ b/src/server/shared/DataStores/DBCDatabaseLoader.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "DatabaseEnv.h" #include "DBCDatabaseLoader.h" +#include "DatabaseEnv.h" #include "Errors.h" #include "StringFormat.h" diff --git a/src/server/shared/DataStores/DBCStore.cpp b/src/server/shared/DataStores/DBCStore.cpp index 2f81fc3ca5..c4e1af2e5d 100644 --- a/src/server/shared/DataStores/DBCStore.cpp +++ b/src/server/shared/DataStores/DBCStore.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "DBCDatabaseLoader.h" #include "DBCStore.h" +#include "DBCDatabaseLoader.h" DBCStorageBase::DBCStorageBase(char const* fmt) : _fieldCount(0), _fileFormat(fmt), _dataTable(nullptr), _indexTableSize(0) { diff --git a/src/server/shared/DataStores/DBCStructure.h b/src/server/shared/DataStores/DBCStructure.h index 6db18d0343..0a8d7dbe3e 100644 --- a/src/server/shared/DataStores/DBCStructure.h +++ b/src/server/shared/DataStores/DBCStructure.h @@ -18,12 +18,12 @@ #ifndef ACORE_DBCSTRUCTURE_H #define ACORE_DBCSTRUCTURE_H -#include "Define.h" #include "DBCEnums.h" +#include "Define.h" #include "SharedDefines.h" #include "Util.h" -#include #include +#include #include // Structures using to access raw DBC data and required packing to portability diff --git a/src/server/shared/Network/AsyncAcceptor.h b/src/server/shared/Network/AsyncAcceptor.h index 083e46c938..f4d0b544e4 100644 --- a/src/server/shared/Network/AsyncAcceptor.h +++ b/src/server/shared/Network/AsyncAcceptor.h @@ -21,9 +21,9 @@ #include "IoContext.h" #include "IpAddress.h" #include "Log.h" +#include #include #include -#include using boost::asio::ip::tcp; diff --git a/src/server/shared/Network/NetworkThread.h b/src/server/shared/Network/NetworkThread.h index f4cf5cf6e2..abe0c0e270 100644 --- a/src/server/shared/Network/NetworkThread.h +++ b/src/server/shared/Network/NetworkThread.h @@ -18,14 +18,14 @@ #ifndef NetworkThread_h__ #define NetworkThread_h__ -#include "Define.h" #include "DeadlineTimer.h" +#include "Define.h" #include "Errors.h" #include "IoContext.h" #include "Log.h" #include "Timer.h" -#include #include +#include #include #include #include diff --git a/src/server/shared/Network/Socket.h b/src/server/shared/Network/Socket.h index c05a61f6ec..07c830add5 100644 --- a/src/server/shared/Network/Socket.h +++ b/src/server/shared/Network/Socket.h @@ -18,14 +18,14 @@ #ifndef __SOCKET_H__ #define __SOCKET_H__ -#include "MessageBuffer.h" #include "Log.h" +#include "MessageBuffer.h" #include -#include -#include -#include -#include #include +#include +#include +#include +#include using boost::asio::ip::tcp; diff --git a/src/server/shared/Packets/ByteBuffer.cpp b/src/server/shared/Packets/ByteBuffer.cpp index d91d1f36f6..85850f3c14 100644 --- a/src/server/shared/Packets/ByteBuffer.cpp +++ b/src/server/shared/Packets/ByteBuffer.cpp @@ -17,12 +17,12 @@ #include "ByteBuffer.h" #include "Errors.h" -#include "MessageBuffer.h" #include "Log.h" +#include "MessageBuffer.h" #include "Util.h" -#include -#include #include +#include +#include ByteBuffer::ByteBuffer(MessageBuffer&& buffer) : _rpos(0), _wpos(0), _storage(buffer.Move()) { } diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 373fe5e270..017881b16f 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -18,12 +18,12 @@ #ifndef _BYTEBUFFER_H #define _BYTEBUFFER_H -#include "Define.h" #include "ByteConverter.h" +#include "Define.h" #include +#include #include #include -#include class MessageBuffer; diff --git a/src/server/shared/Secrets/SecretMgr.h b/src/server/shared/Secrets/SecretMgr.h index 07c0deaf2f..a8af53175c 100644 --- a/src/server/shared/Secrets/SecretMgr.h +++ b/src/server/shared/Secrets/SecretMgr.h @@ -20,8 +20,8 @@ #include "BigNumber.h" #include "Common.h" -#include "Optional.h" #include "Log.h" +#include "Optional.h" #include #include #include diff --git a/src/server/shared/enuminfo_SharedDefines.cpp b/src/server/shared/enuminfo_SharedDefines.cpp index 06ea37987d..4f8f38c233 100644 --- a/src/server/shared/enuminfo_SharedDefines.cpp +++ b/src/server/shared/enuminfo_SharedDefines.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "SharedDefines.h" #include "Define.h" +#include "SharedDefines.h" #include "SmartEnum.h" #include diff --git a/src/server/worldserver/ACSoap/ACSoap.cpp b/src/server/worldserver/ACSoap/ACSoap.cpp index e3ce8094a3..ff2ea70b0f 100644 --- a/src/server/worldserver/ACSoap/ACSoap.cpp +++ b/src/server/worldserver/ACSoap/ACSoap.cpp @@ -18,9 +18,9 @@ #include "ACSoap.h" #include "AccountMgr.h" #include "Log.h" +#include "World.h" #include "soapH.h" #include "soapStub.h" -#include "World.h" void ACSoapThread(const std::string& host, uint16 port) { diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index c75c439dfe..5a6b966519 100644 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -19,21 +19,21 @@ /// @{ /// \file -#include "Common.h" -#include "Errors.h" -#include "ObjectMgr.h" -#include "World.h" -#include "Config.h" #include "CliRunnable.h" +#include "Common.h" +#include "Config.h" +#include "Errors.h" #include "Log.h" +#include "ObjectMgr.h" #include "Util.h" +#include "World.h" #if AC_PLATFORM != AC_PLATFORM_WINDOWS #include "Chat.h" #include "ChatCommand.h" #include -#include #include +#include #endif static constexpr char CLI_PREFIX[] = "AC> "; diff --git a/src/test/mocks/WorldMock.h b/src/test/mocks/WorldMock.h index 14ec735790..6d85da9191 100644 --- a/src/test/mocks/WorldMock.h +++ b/src/test/mocks/WorldMock.h @@ -19,8 +19,8 @@ #define AZEROTHCORE_WORLDMOCK_H #include "ArenaSpectator.h" -#include "gmock/gmock.h" #include "IWorld.h" +#include "gmock/gmock.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 c0ff06b879..e420cb18d3 100644 --- a/src/test/server/game/Miscellaneous/FormulasTest.cpp +++ b/src/test/server/game/Miscellaneous/FormulasTest.cpp @@ -16,8 +16,8 @@ */ #include "Formulas.h" -#include "gtest/gtest.h" #include "WorldMock.h" +#include "gtest/gtest.h" using namespace Acore::Honor; using namespace Acore::XP; diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index c9cc42503b..8d566a954b 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #ifdef _WIN32 #include "direct.h" diff --git a/src/tools/map_extractor/mpq_libmpq.cpp b/src/tools/map_extractor/mpq_libmpq.cpp index 64ab3154e2..cac360087d 100644 --- a/src/tools/map_extractor/mpq_libmpq.cpp +++ b/src/tools/map_extractor/mpq_libmpq.cpp @@ -16,8 +16,8 @@ */ #include "mpq_libmpq04.h" -#include #include +#include ArchiveSet gOpenArchives; diff --git a/src/tools/mesh_extractor/Cache.h b/src/tools/mesh_extractor/Cache.h index 9f4c12ab07..88d5cd2310 100644 --- a/src/tools/mesh_extractor/Cache.h +++ b/src/tools/mesh_extractor/Cache.h @@ -17,13 +17,13 @@ #ifndef CACHE_H #define CACHE_H -#include -#include #include "Define.h" -#include "PolicyLock.h" -#include -#include "WorldModelRoot.h" #include "Model.h" +#include "PolicyLock.h" +#include "WorldModelRoot.h" +#include +#include +#include template class GenericCache diff --git a/src/tools/mesh_extractor/ChunkedData.h b/src/tools/mesh_extractor/ChunkedData.h index a7c22aa520..6af885d67e 100644 --- a/src/tools/mesh_extractor/ChunkedData.h +++ b/src/tools/mesh_extractor/ChunkedData.h @@ -18,8 +18,8 @@ #ifndef CHNK_H #define CHNK_H -#include #include "Chunk.h" +#include class ChunkedData { diff --git a/src/tools/mesh_extractor/ContinentBuilder.cpp b/src/tools/mesh_extractor/ContinentBuilder.cpp index d1ef1a76ae..06ac2dc9eb 100644 --- a/src/tools/mesh_extractor/ContinentBuilder.cpp +++ b/src/tools/mesh_extractor/ContinentBuilder.cpp @@ -16,14 +16,14 @@ */ #include "ContinentBuilder.h" -#include "TileBuilder.h" -#include "WDT.h" -#include "Utils.h" -#include "DetourNavMesh.h" #include "Cache.h" -#include -#include "Recast.h" #include "DetourCommon.h" +#include "DetourNavMesh.h" +#include "Recast.h" +#include "TileBuilder.h" +#include "Utils.h" +#include "WDT.h" +#include class BuilderThread { diff --git a/src/tools/mesh_extractor/ContinentBuilder.h b/src/tools/mesh_extractor/ContinentBuilder.h index 882a081908..b414b4c867 100644 --- a/src/tools/mesh_extractor/ContinentBuilder.h +++ b/src/tools/mesh_extractor/ContinentBuilder.h @@ -17,9 +17,9 @@ #ifndef CONT_BUILDER_H #define CONT_BUILDER_H -#include -#include "WDT.h" #include "Define.h" +#include "WDT.h" +#include class ContinentBuilder { diff --git a/src/tools/mesh_extractor/DBC.cpp b/src/tools/mesh_extractor/DBC.cpp index 8301dd1a65..8f7d9164d6 100644 --- a/src/tools/mesh_extractor/DBC.cpp +++ b/src/tools/mesh_extractor/DBC.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include #include "DBC.h" #include "Define.h" +#include DBC::DBC( FILE* stream ) : StringBlock(nullptr), StringBlockSize(0), IsFaulty(true) { diff --git a/src/tools/mesh_extractor/DBC.h b/src/tools/mesh_extractor/DBC.h index 205fbccd7b..4d93b13eaf 100644 --- a/src/tools/mesh_extractor/DBC.h +++ b/src/tools/mesh_extractor/DBC.h @@ -17,9 +17,9 @@ #ifndef DBC_H #define DBC_H -#include -#include #include "Define.h" +#include +#include class Record; diff --git a/src/tools/mesh_extractor/DoodadHandler.cpp b/src/tools/mesh_extractor/DoodadHandler.cpp index 1355552b44..00fda514ba 100644 --- a/src/tools/mesh_extractor/DoodadHandler.cpp +++ b/src/tools/mesh_extractor/DoodadHandler.cpp @@ -16,10 +16,10 @@ */ #include "DoodadHandler.h" -#include "Chunk.h" #include "Cache.h" -#include "Model.h" +#include "Chunk.h" #include "G3D/Matrix4.h" +#include "Model.h" DoodadHandler::DoodadHandler( ADT* adt ) : ObjectDataHandler(adt), _definitions(nullptr), _paths(nullptr) diff --git a/src/tools/mesh_extractor/DoodadHandler.h b/src/tools/mesh_extractor/DoodadHandler.h index 1f65a4033f..321b62371e 100644 --- a/src/tools/mesh_extractor/DoodadHandler.h +++ b/src/tools/mesh_extractor/DoodadHandler.h @@ -17,10 +17,10 @@ #ifndef DOOADHNDL_H #define DOOADHNDL_H -#include "ObjectDataHandler.h" -#include "Utils.h" #include "Chunk.h" #include "Model.h" +#include "ObjectDataHandler.h" +#include "Utils.h" #include #include diff --git a/src/tools/mesh_extractor/Geometry.cpp b/src/tools/mesh_extractor/Geometry.cpp index 4dcb14c53e..d719c7c069 100644 --- a/src/tools/mesh_extractor/Geometry.cpp +++ b/src/tools/mesh_extractor/Geometry.cpp @@ -16,10 +16,10 @@ */ #include "Geometry.h" -#include "Constants.h" #include "ADT.h" -#include "WorldModelHandler.h" +#include "Constants.h" #include "DoodadHandler.h" +#include "WorldModelHandler.h" #include Geometry::Geometry() : Transform(false) diff --git a/src/tools/mesh_extractor/LiquidHandler.h b/src/tools/mesh_extractor/LiquidHandler.h index 6fd50f4a3c..3003749cf5 100644 --- a/src/tools/mesh_extractor/LiquidHandler.h +++ b/src/tools/mesh_extractor/LiquidHandler.h @@ -18,8 +18,8 @@ #ifndef LIQUID_H #define LIQUID_H #include "ADT.h" -#include "Utils.h" #include "Define.h" +#include "Utils.h" #include diff --git a/src/tools/mesh_extractor/MPQ.cpp b/src/tools/mesh_extractor/MPQ.cpp index 12e2264bb7..7073181b83 100644 --- a/src/tools/mesh_extractor/MPQ.cpp +++ b/src/tools/mesh_extractor/MPQ.cpp @@ -17,8 +17,8 @@ #include "MPQ.h" #include "MPQMgr.h" -#include #include +#include MPQArchive::MPQArchive(const char* filename) { diff --git a/src/tools/mesh_extractor/MPQ.h b/src/tools/mesh_extractor/MPQ.h index a8e84f2790..5d57165cbd 100644 --- a/src/tools/mesh_extractor/MPQ.h +++ b/src/tools/mesh_extractor/MPQ.h @@ -18,14 +18,14 @@ #ifndef MPQ_H #define MPQ_H -#include "libmpq/mpq.h" #include "Define.h" #include "Errors.h" -#include +#include "libmpq/mpq.h" #include -#include -#include #include +#include +#include +#include class MPQArchive { diff --git a/src/tools/mesh_extractor/MPQMgr.cpp b/src/tools/mesh_extractor/MPQMgr.cpp index 9b71dfa71a..864258fb5b 100644 --- a/src/tools/mesh_extractor/MPQMgr.cpp +++ b/src/tools/mesh_extractor/MPQMgr.cpp @@ -16,8 +16,8 @@ */ #include "MPQMgr.h" -#include "MPQ.h" #include "DBC.h" +#include "MPQ.h" #include "Utils.h" char const* MPQMgr::Files[] = diff --git a/src/tools/mesh_extractor/MPQMgr.h b/src/tools/mesh_extractor/MPQMgr.h index aa26f34aa6..5b1718327d 100644 --- a/src/tools/mesh_extractor/MPQMgr.h +++ b/src/tools/mesh_extractor/MPQMgr.h @@ -20,9 +20,9 @@ #include "MPQ.h" #include "PolicyLock.h" +#include #include #include -#include class DBC; class MPQMgr diff --git a/src/tools/mesh_extractor/MapChunk.h b/src/tools/mesh_extractor/MapChunk.h index c74318fa6a..83b0a43d49 100644 --- a/src/tools/mesh_extractor/MapChunk.h +++ b/src/tools/mesh_extractor/MapChunk.h @@ -18,8 +18,8 @@ #ifndef MAPCHUNK_H #define MAPCHUNK_H #include "Chunk.h" -#include "Utils.h" #include "Constants.h" +#include "Utils.h" #include class ADT; diff --git a/src/tools/mesh_extractor/MeshExtractor.cpp b/src/tools/mesh_extractor/MeshExtractor.cpp index 7390e449b9..117c0287f3 100644 --- a/src/tools/mesh_extractor/MeshExtractor.cpp +++ b/src/tools/mesh_extractor/MeshExtractor.cpp @@ -15,17 +15,17 @@ * with this program. If not, see . */ -#include "MPQMgr.h" -#include "WDT.h" -#include "ContinentBuilder.h" #include "Cache.h" -#include "DBC.h" #include "Constants.h" +#include "ContinentBuilder.h" +#include "DBC.h" +#include "MPQMgr.h" #include "Model.h" +#include "WDT.h" -#include "Recast.h" #include "DetourNavMesh.h" #include "DetourNavMeshQuery.h" +#include "Recast.h" #include diff --git a/src/tools/mesh_extractor/Model.h b/src/tools/mesh_extractor/Model.h index 21235fd7ab..0aa625e6ff 100644 --- a/src/tools/mesh_extractor/Model.h +++ b/src/tools/mesh_extractor/Model.h @@ -17,8 +17,8 @@ #ifndef MODEL_H #define MODEL_H -#include #include "Utils.h" +#include class Model { diff --git a/src/tools/mesh_extractor/ObjectDataHandler.cpp b/src/tools/mesh_extractor/ObjectDataHandler.cpp index 19d6f02b0d..b3ff57b319 100644 --- a/src/tools/mesh_extractor/ObjectDataHandler.cpp +++ b/src/tools/mesh_extractor/ObjectDataHandler.cpp @@ -16,8 +16,8 @@ */ #include "ObjectDataHandler.h" -#include "Chunk.h" #include "ADT.h" +#include "Chunk.h" #include "ChunkedData.h" void ObjectDataHandler::ProcessMapChunk( MapChunk* chunk ) diff --git a/src/tools/mesh_extractor/TileBuilder.cpp b/src/tools/mesh_extractor/TileBuilder.cpp index d2ec17b317..d7cef07d75 100644 --- a/src/tools/mesh_extractor/TileBuilder.cpp +++ b/src/tools/mesh_extractor/TileBuilder.cpp @@ -15,18 +15,18 @@ * with this program. If not, see . */ -#include "ContinentBuilder.h" #include "TileBuilder.h" -#include "Geometry.h" -#include "WorldModelRoot.h" -#include "Constants.h" -#include "Utils.h" -#include "Cache.h" #include "ADT.h" -#include "WDT.h" +#include "Cache.h" +#include "Constants.h" +#include "ContinentBuilder.h" +#include "DetourNavMeshBuilder.h" +#include "Geometry.h" #include "Recast.h" #include "RecastAlloc.h" -#include "DetourNavMeshBuilder.h" +#include "Utils.h" +#include "WDT.h" +#include "WorldModelRoot.h" TileBuilder::TileBuilder(ContinentBuilder* _cBuilder, std::string world, int x, int y, uint32 mapId) : World(world), X(x), Y(y), MapId(mapId), _Geometry(nullptr), DataSize(0), cBuilder(_cBuilder) diff --git a/src/tools/mesh_extractor/TileBuilder.h b/src/tools/mesh_extractor/TileBuilder.h index e60ecbfb14..03df0f0dc8 100644 --- a/src/tools/mesh_extractor/TileBuilder.h +++ b/src/tools/mesh_extractor/TileBuilder.h @@ -17,8 +17,8 @@ #ifndef TILE_BUILD_H #define TILE_BUILD_H -#include #include "Recast.h" +#include #include "Geometry.h" #include "WorldModelRoot.h" diff --git a/src/tools/mesh_extractor/Utils.cpp b/src/tools/mesh_extractor/Utils.cpp index e77a47c901..d71711ed78 100644 --- a/src/tools/mesh_extractor/Utils.cpp +++ b/src/tools/mesh_extractor/Utils.cpp @@ -16,11 +16,11 @@ */ #include "Utils.h" -#include "WorldModelHandler.h" #include "Constants.h" -#include #include "G3D/Matrix4.h" #include "G3D/Quat.h" +#include "WorldModelHandler.h" +#include #ifdef _WIN32 #include "direct.h" diff --git a/src/tools/mesh_extractor/Utils.h b/src/tools/mesh_extractor/Utils.h index 3465553954..df5b13d1de 100644 --- a/src/tools/mesh_extractor/Utils.h +++ b/src/tools/mesh_extractor/Utils.h @@ -19,14 +19,14 @@ #define UTILS_H #include -#include #include +#include -#include "G3D/Matrix4.h" #include "DetourNavMesh.h" +#include "G3D/Matrix4.h" -#include "Define.h" #include "Constants.h" +#include "Define.h" struct WorldModelDefinition; class DoodadDefinition; diff --git a/src/tools/mesh_extractor/WorldModelGroup.cpp b/src/tools/mesh_extractor/WorldModelGroup.cpp index 060fbf41f3..4b3085e688 100644 --- a/src/tools/mesh_extractor/WorldModelGroup.cpp +++ b/src/tools/mesh_extractor/WorldModelGroup.cpp @@ -16,8 +16,8 @@ */ #include "WorldModelGroup.h" -#include "ChunkedData.h" #include "Chunk.h" +#include "ChunkedData.h" #include "Utils.h" WorldModelGroup::WorldModelGroup( std::string path, int groupIndex ) : GroupIndex(groupIndex), MOBA(nullptr), IsBad(false), HasLiquidData(false) diff --git a/src/tools/mesh_extractor/WorldModelHandler.cpp b/src/tools/mesh_extractor/WorldModelHandler.cpp index 49f13c7ca9..b1e83fa7e8 100644 --- a/src/tools/mesh_extractor/WorldModelHandler.cpp +++ b/src/tools/mesh_extractor/WorldModelHandler.cpp @@ -16,13 +16,13 @@ */ #include "WorldModelHandler.h" -#include "WorldModelRoot.h" -#include "Chunk.h" #include "Cache.h" -#include "Model.h" +#include "Chunk.h" #include "Define.h" #include "G3D/Matrix4.h" #include "G3D/Quat.h" +#include "Model.h" +#include "WorldModelRoot.h" #include WorldModelDefinition WorldModelDefinition::Read( FILE* file ) diff --git a/src/tools/mesh_extractor/WorldModelHandler.h b/src/tools/mesh_extractor/WorldModelHandler.h index 5131fa766e..3ea3820029 100644 --- a/src/tools/mesh_extractor/WorldModelHandler.h +++ b/src/tools/mesh_extractor/WorldModelHandler.h @@ -18,9 +18,9 @@ #ifndef WMODEL_HNDL_H #define WMODEL_HNDL_H #include "Define.h" +#include "ObjectDataHandler.h" #include "Utils.h" #include "WorldModelRoot.h" -#include "ObjectDataHandler.h" #include #include diff --git a/src/tools/mmaps_generator/IntermediateValues.h b/src/tools/mmaps_generator/IntermediateValues.h index 54e9367cad..85d127a9e1 100644 --- a/src/tools/mmaps_generator/IntermediateValues.h +++ b/src/tools/mmaps_generator/IntermediateValues.h @@ -18,10 +18,10 @@ #ifndef _INTERMEDIATE_VALUES_H #define _INTERMEDIATE_VALUES_H -#include "PathCommon.h" -#include "TerrainBuilder.h" -#include "Recast.h" #include "DetourNavMesh.h" +#include "PathCommon.h" +#include "Recast.h" +#include "TerrainBuilder.h" namespace MMAP { diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h index 3e7a214740..70f5cfe6fc 100644 --- a/src/tools/mmaps_generator/MapBuilder.h +++ b/src/tools/mmaps_generator/MapBuilder.h @@ -18,19 +18,19 @@ #ifndef _MAP_BUILDER_H #define _MAP_BUILDER_H -#include -#include -#include #include +#include #include +#include #include +#include -#include "TerrainBuilder.h" #include "IntermediateValues.h" +#include "TerrainBuilder.h" -#include "Recast.h" #include "DetourNavMesh.h" #include "PCQueue.h" +#include "Recast.h" using namespace VMAP; diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp index a4dcb931da..834ae794b3 100644 --- a/src/tools/mmaps_generator/PathGenerator.cpp +++ b/src/tools/mmaps_generator/PathGenerator.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "PathCommon.h" #include "MapBuilder.h" +#include "PathCommon.h" #include "Timer.h" using namespace MMAP; diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index eeb3ea45bc..5946b57ca5 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -16,12 +16,12 @@ */ #include "TerrainBuilder.h" -#include "PathCommon.h" #include "MapBuilder.h" #include "MapDefines.h" -#include "VMapMgr2.h" #include "MapTree.h" #include "ModelInstance.h" +#include "PathCommon.h" +#include "VMapMgr2.h" #include // ****************************************** diff --git a/src/tools/vmap4_assembler/VMapAssembler.cpp b/src/tools/vmap4_assembler/VMapAssembler.cpp index d15fa9fc36..8b37339e05 100644 --- a/src/tools/vmap4_assembler/VMapAssembler.cpp +++ b/src/tools/vmap4_assembler/VMapAssembler.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include #include +#include #include "TileAssembler.h" diff --git a/src/tools/vmap4_extractor/adtfile.cpp b/src/tools/vmap4_extractor/adtfile.cpp index 4e9a07bbfe..8367ba3d0e 100644 --- a/src/tools/vmap4_extractor/adtfile.cpp +++ b/src/tools/vmap4_extractor/adtfile.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "vmapexport.h" #include "adtfile.h" +#include "vmapexport.h" #include #include diff --git a/src/tools/vmap4_extractor/adtfile.h b/src/tools/vmap4_extractor/adtfile.h index 3fc55f8f6d..ce6182cc28 100644 --- a/src/tools/vmap4_extractor/adtfile.h +++ b/src/tools/vmap4_extractor/adtfile.h @@ -18,9 +18,9 @@ #ifndef ADT_H #define ADT_H +#include "model.h" #include "mpq_libmpq04.h" #include "wmo.h" -#include "model.h" #define TILESIZE (533.33333f) #define CHUNKSIZE ((TILESIZE) / 16.0f) diff --git a/src/tools/vmap4_extractor/gameobject_extract.cpp b/src/tools/vmap4_extractor/gameobject_extract.cpp index c9b39701ac..3983760787 100644 --- a/src/tools/vmap4_extractor/gameobject_extract.cpp +++ b/src/tools/vmap4_extractor/gameobject_extract.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "model.h" -#include "dbcfile.h" #include "adtfile.h" +#include "dbcfile.h" +#include "model.h" #include "vmapexport.h" #include #include diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp index f69c66860c..5d6a10e76d 100644 --- a/src/tools/vmap4_extractor/model.cpp +++ b/src/tools/vmap4_extractor/model.cpp @@ -15,14 +15,14 @@ * with this program. If not, see . */ -#include "vmapexport.h" #include "model.h" -#include "wmo.h" #include "adtfile.h" -#include #include "mpq_libmpq04.h" +#include "vmapexport.h" +#include "wmo.h" #include #include +#include #include #include diff --git a/src/tools/vmap4_extractor/model.h b/src/tools/vmap4_extractor/model.h index 8994e61fca..6b4e3e0c8a 100644 --- a/src/tools/vmap4_extractor/model.h +++ b/src/tools/vmap4_extractor/model.h @@ -19,8 +19,8 @@ #define MODEL_H #include "loadlib/loadlib.h" -#include "vec3d.h" #include "modelheaders.h" +#include "vec3d.h" #include class MPQFile; diff --git a/src/tools/vmap4_extractor/mpq_libmpq.cpp b/src/tools/vmap4_extractor/mpq_libmpq.cpp index c9a2dfe56a..d074fd3d2c 100644 --- a/src/tools/vmap4_extractor/mpq_libmpq.cpp +++ b/src/tools/vmap4_extractor/mpq_libmpq.cpp @@ -16,8 +16,8 @@ */ #include "mpq_libmpq04.h" -#include #include +#include ArchiveSet gOpenArchives; diff --git a/src/tools/vmap4_extractor/vec3d.h b/src/tools/vmap4_extractor/vec3d.h index 167600a8d4..4312874c75 100644 --- a/src/tools/vmap4_extractor/vec3d.h +++ b/src/tools/vmap4_extractor/vec3d.h @@ -18,8 +18,8 @@ #ifndef VEC3D_H #define VEC3D_H -#include #include +#include class Vec3D { diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index 3f0f452019..318be5089f 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include #ifdef WIN32 #include @@ -33,19 +33,13 @@ #undef min #undef max -//#pragma warning(disable : 4505) -//#pragma comment(lib, "Winmm.lib") - -#include - //From Extractor -#include "adtfile.h" -#include "wdtfile.h" -#include "dbcfile.h" -#include "wmo.h" -#include "mpq_libmpq04.h" - #include "vmapexport.h" +#include "adtfile.h" +#include "dbcfile.h" +#include "mpq_libmpq04.h" +#include "wdtfile.h" +#include "wmo.h" //------------------------------------------------------------------------------ // Defines diff --git a/src/tools/vmap4_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp index 36add4e78b..0a0ff125b3 100644 --- a/src/tools/vmap4_extractor/wdtfile.cpp +++ b/src/tools/vmap4_extractor/wdtfile.cpp @@ -15,9 +15,9 @@ * with this program. If not, see . */ -#include "vmapexport.h" #include "wdtfile.h" #include "adtfile.h" +#include "vmapexport.h" #include diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp index ce1796da89..8f8229602f 100644 --- a/src/tools/vmap4_extractor/wmo.cpp +++ b/src/tools/vmap4_extractor/wmo.cpp @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#include "adtfile.h" #include "wmo.h" +#include "adtfile.h" #include "vec3d.h" #include "vmapexport.h" #include