From af769c6c7e7aa686b3eaaf4bb689ba2d59bbef6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Sat, 27 Jul 2024 00:56:33 +0200 Subject: [PATCH] refactor(Scripts/Northrend): remove unused imports (#19460) * refactor(Scripts/Northrend): remove unused imports * chore: wip --- .../scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h | 3 --- .../Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp | 2 ++ .../Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp | 2 ++ .../AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp | 1 + .../RubySanctum/boss_baltharus_the_warborn.cpp | 2 ++ .../ChamberOfAspects/RubySanctum/boss_halion.cpp | 1 + .../RubySanctum/boss_saviana_ragefire.cpp | 1 + .../RubySanctum/instance_ruby_sanctum.cpp | 1 + .../Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h | 7 ------- .../TrialOfTheChampion/boss_grand_champions.cpp | 1 + .../TrialOfTheChampion/trial_of_the_champion.h | 1 - .../TrialOfTheCrusader/boss_anubarak_trial.cpp | 1 + .../TrialOfTheCrusader/trial_of_the_crusader.h | 1 - .../scripts/Northrend/DraktharonKeep/boss_novos.cpp | 1 + .../scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp | 1 + .../scripts/Northrend/DraktharonKeep/boss_trollgore.cpp | 2 ++ .../scripts/Northrend/DraktharonKeep/drak_tharon_keep.h | 2 -- .../DraktharonKeep/instance_drak_tharon_keep.cpp | 1 + .../FrozenHalls/HallsOfReflection/boss_falric.cpp | 1 + .../FrozenHalls/HallsOfReflection/boss_marwyn.cpp | 3 +++ .../FrozenHalls/HallsOfReflection/halls_of_reflection.cpp | 5 +++++ .../FrozenHalls/HallsOfReflection/halls_of_reflection.h | 7 ------- .../HallsOfReflection/instance_halls_of_reflection.cpp | 1 + .../FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp | 1 - .../Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp | 1 - .../scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp | 1 + src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp | 1 + src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp | 2 ++ src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp | 1 + src/server/scripts/Northrend/Gundrak/gundrak.h | 1 - .../Northrend/IcecrownCitadel/icecrown_citadel.cpp | 1 - .../scripts/Northrend/IcecrownCitadel/icecrown_citadel.h | 2 -- src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp | 1 + src/server/scripts/Northrend/Naxxramas/naxxramas.h | 1 - .../Nexus/EyeOfEternity/instance_eye_of_eternity.cpp | 1 - .../scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp | 2 ++ .../scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp | 4 ++++ src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp | 1 + .../scripts/Northrend/Nexus/Nexus/instance_nexus.cpp | 1 + src/server/scripts/Northrend/Nexus/Nexus/nexus.h | 6 ------ src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp | 1 + src/server/scripts/Northrend/Nexus/Oculus/oculus.h | 2 -- .../Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp | 8 +++++++- .../scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp | 1 - src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp | 1 - src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h | 3 --- .../UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp | 1 - .../Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp | 1 + .../Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h | 1 - .../UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h | 1 - .../VaultOfArchavon/instance_vault_of_archavon.cpp | 1 - 51 files changed, 50 insertions(+), 47 deletions(-) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h index 2f6c474a3..c124b4457 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h @@ -19,9 +19,6 @@ #define DEF_AZJOL_NERUB_H #include "CreatureAIImpl.h" -#include "SpellAuraEffects.h" -#include "SpellAuras.h" -#include "SpellScript.h" #define DataHeader "AN" diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 1e69836ac..2032efe5d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -19,6 +19,8 @@ #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "azjol_nerub.h" +#include "SpellInfo.h" +#include "SpellScript.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 41f15d89a..df442a5ed 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -21,6 +21,8 @@ #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "azjol_nerub.h" +#include "SpellAuraEffects.h" +#include "SpellScript.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 d4c9b8a33..0fdcc10c9 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -21,6 +21,7 @@ #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "azjol_nerub.h" +#include "SpellScript.h" DoorData const doorData[] = { 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 5f939219c..34a483f77 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 @@ -18,10 +18,12 @@ #include "AreaTriggerScript.h" #include "CreatureScript.h" #include "ObjectMgr.h" +#include "Player.h" #include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScriptLoader.h" #include "ruby_sanctum.h" +#include "SpellScript.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 3a5cdd6cf..9869c4636 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -18,6 +18,7 @@ #include "CreatureScript.h" #include "GameObjectAI.h" #include "MapMgr.h" +#include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" #include "Spell.h" 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 39afa96a6..c11e61216 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -19,6 +19,7 @@ #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "ruby_sanctum.h" +#include "SpellScript.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 c08535c23..2296abae5 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -23,6 +23,7 @@ #include "TemporarySummon.h" #include "WorldPacket.h" #include "ruby_sanctum.h" +#include "SpellScript.h" BossBoundaryData const boundaries = { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h index 6e6f59b76..a75092ae8 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h @@ -18,14 +18,7 @@ #ifndef RUBY_SANCTUM_H_ #define RUBY_SANCTUM_H_ -#include "Creature.h" #include "CreatureAIImpl.h" -#include "GameObjectAI.h" -#include "Map.h" -#include "Opcodes.h" -#include "PassiveAI.h" -#include "Player.h" -#include "SpellScript.h" #define DataHeader "RS" 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 e48f714c2..cb8d3be45 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "CombatAI.h" #include "CreatureScript.h" #include "PassiveAI.h" #include "Player.h" diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h index be0dfa453..d8f71c00d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h @@ -18,7 +18,6 @@ #ifndef DEF_TOC_H #define DEF_TOC_H -#include "CombatAI.h" #include "CreatureAIImpl.h" #define DataHeader "TC" 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 ecb1ac0b1..185fedd97 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -19,6 +19,7 @@ #include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" +#include "SpellAuraEffects.h" #include "SpellScript.h" #include "SpellScriptLoader.h" #include "trial_of_the_crusader.h" 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 cc1ac3599..6b87cb236 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 @@ -20,7 +20,6 @@ #include "CreatureAIImpl.h" #include "GridNotifiers.h" -#include "SpellAuraEffects.h" #define DataHeader "TCR" diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index bc5f69985..b4bbcfc56 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -20,6 +20,7 @@ #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "drak_tharon_keep.h" +#include "SpellScript.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 2015c0ef3..ef883269e 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -19,6 +19,7 @@ #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "drak_tharon_keep.h" +#include "SpellScript.h" enum Yells { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index bd10397c9..0ad8fb6bb 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -21,6 +21,8 @@ #include "SpellAuras.h" #include "SpellScriptLoader.h" #include "drak_tharon_keep.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum Yells { diff --git a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h index 43a52b2ec..422139b32 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h +++ b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h @@ -19,8 +19,6 @@ #define DEF_DRAK_THARON_H #include "CreatureAIImpl.h" -#include "SpellAuraEffects.h" -#include "SpellScript.h" #define DataHeader "DTK" 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 477f2c3fb..2710c6063 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -20,6 +20,7 @@ #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "drak_tharon_keep.h" +#include "SpellScript.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index 5d999d927..14330239f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -17,6 +17,7 @@ #include "CreatureScript.h" #include "halls_of_reflection.h" +#include "ScriptedCreature.h" enum Yells { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index c8366d0b9..75d715112 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -18,6 +18,9 @@ #include "CreatureScript.h" #include "SpellScriptLoader.h" #include "halls_of_reflection.h" +#include "ScriptedCreature.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum Yells { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index f68f9fe1c..2c5d00e36 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -18,7 +18,12 @@ #include "halls_of_reflection.h" #include "AreaTriggerScript.h" #include "CreatureScript.h" +#include "InstanceScript.h" #include "MotionMaster.h" +#include "PassiveAI.h" +#include "ScriptedCreature.h" +#include "ScriptedGossip.h" +#include "SpellScript.h" #include "SpellScriptLoader.h" enum Events 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 0f78df2c1..204ce5ad3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -19,14 +19,7 @@ #define DEF_HALLS_OF_REFLECTION_H #include "CreatureAIImpl.h" -#include "CreatureScript.h" -#include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "SpellAuraEffects.h" -#include "SpellAuras.h" -#include "SpellScript.h" #define DataHeader "HOR" 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 f37361ebb..9724ad8d1 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 @@ -19,6 +19,7 @@ #include "MapMgr.h" #include "Transport.h" #include "halls_of_reflection.h" +#include "InstanceScript.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 f4c3920c5..a522b7610 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -17,7 +17,6 @@ #include "CreatureGroups.h" #include "CreatureScript.h" -#include "Opcodes.h" #include "Player.h" #include "ScriptedCreature.h" #include "SpellAuras.h" diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 14f4332e9..0f46e27e5 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -16,7 +16,6 @@ */ #include "CreatureScript.h" -#include "Opcodes.h" #include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 3dab952e3..17f81c164 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -19,6 +19,7 @@ #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "gundrak.h" +#include "SpellScript.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 e22c3bce2..4d202f7b5 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -20,6 +20,7 @@ #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "gundrak.h" +#include "SpellScript.h" enum Spells { diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 9e1aac8e0..a85172a2d 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -20,6 +20,8 @@ #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "gundrak.h" +#include "SpellInfo.h" +#include "SpellScript.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 0ed90bd39..d9e57fab1 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -20,6 +20,7 @@ #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "gundrak.h" +#include "SpellScript.h" enum Spells { diff --git a/src/server/scripts/Northrend/Gundrak/gundrak.h b/src/server/scripts/Northrend/Gundrak/gundrak.h index ec6da02e0..8d38819ea 100644 --- a/src/server/scripts/Northrend/Gundrak/gundrak.h +++ b/src/server/scripts/Northrend/Gundrak/gundrak.h @@ -19,7 +19,6 @@ #define DEF_GUNDRAK_H #include "CreatureAIImpl.h" -#include "SpellScript.h" #define DataHeader "GD" diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 08d1b77de..b6be91e6a 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -16,7 +16,6 @@ */ #include "icecrown_citadel.h" -#include "AccountMgr.h" #include "AreaTriggerScript.h" #include "Cell.h" #include "CellImpl.h" diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 6fc6e5d46..fa4516546 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -28,8 +28,6 @@ #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SpellAuraEffects.h" -#include "SpellAuras.h" -#include "SpellMgr.h" #include "SpellScript.h" #include "SpellScriptLoader.h" diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index eed3cd6cf..f86b4b55d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -18,6 +18,7 @@ #include "CreatureScript.h" #include "ScriptedCreature.h" #include "naxxramas.h" +#include "SpellInfo.h" enum Says { diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h index 5c237d784..8485d7e40 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h @@ -19,7 +19,6 @@ #define DEF_NAXXRAMAS_H #include "CreatureAIImpl.h" -#include "SpellScript.h" #define DataHeader "NAX" 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 8b3d6813c..8c6be93be 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,7 +15,6 @@ * with this program. If not, see . */ -#include "CreatureScript.h" #include "InstanceMapScript.h" #include "Player.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 50a559761..34a69d479 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -18,8 +18,10 @@ #include "AchievementCriteriaScript.h" #include "CreatureScript.h" +#include "MapReference.h" #include "ScriptedCreature.h" #include "nexus.h" +#include "Player.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 630460093..c3efec7bf 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -17,9 +17,13 @@ #include "AchievementCriteriaScript.h" #include "CreatureScript.h" +#include "GameEventMgr.h" +#include "GridNotifiers.h" #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "nexus.h" +#include "SpellInfo.h" +#include "SpellScript.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 f0d5212ee..66dd21655 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -18,6 +18,7 @@ #include "CreatureScript.h" #include "ScriptedCreature.h" #include "nexus.h" +#include "PassiveAI.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 14e3acddb..eb3ac50bb 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -19,6 +19,7 @@ #include "InstanceMapScript.h" #include "ScriptedCreature.h" #include "nexus.h" +#include "Player.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h index 6186b7a71..dbc87982a 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h +++ b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h @@ -19,12 +19,6 @@ #define DEF_NEXUS_H #include "CreatureAIImpl.h" -#include "GameEventMgr.h" -#include "GridNotifiers.h" -#include "PassiveAI.h" -#include "Player.h" -#include "SpellAuras.h" -#include "SpellScript.h" #define DataHeader "NEX" diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 308349b7e..00d634860 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -18,6 +18,7 @@ #include "CreatureScript.h" #include "ScriptedCreature.h" #include "oculus.h" +#include "SpellAuras.h" enum Spells { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h index 69e5fd5c3..9140cd7be 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h @@ -19,8 +19,6 @@ #define DEF_OCULUS_H #include "CreatureAIImpl.h" -#include "SpellAuraEffects.h" -#include "SpellAuras.h" #include "SpellScript.h" #define DataHeader "OC" 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 786ae2c21..46a9dc8c3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -16,11 +16,11 @@ */ #include "AchievementCriteriaScript.h" +#include "CellImpl.h" #include "CombatAI.h" #include "CreatureScript.h" #include "GameObjectScript.h" #include "GridNotifiers.h" -#include "Opcodes.h" #include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" @@ -33,6 +33,12 @@ #include "Vehicle.h" #include "ulduar.h" +/// @todo: this import is not necessary for compilation and marked as unused by the IDE +// however, for some reasons removing it would cause a damn linking issue +// there is probably some underlying problem with imports which should properly addressed +// see: https://github.com/azerothcore/azerothcore-wotlk/issues/9766 +#include "GridNotifiersImpl.h" + enum LeviathanSpells { // Leviathan basic diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp index 9fc2ba88a..b9f4f71f3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp @@ -19,7 +19,6 @@ #include "CreatureAI.h" #include "CreatureScript.h" #include "Object.h" -#include "Opcodes.h" #include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp index b6ce8bbe3..b43119631 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp @@ -19,7 +19,6 @@ #include "AreaTriggerScript.h" #include "CombatAI.h" #include "CreatureScript.h" -#include "GameObjectScript.h" #include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index 1735aeb39..4093dd891 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -18,11 +18,8 @@ #ifndef DEF_ULDUAR_H #define DEF_ULDUAR_H -#include "CellImpl.h" -#include "Chat.h" #include "CreatureAIImpl.h" #include "GridNotifiers.h" -#include "GridNotifiersImpl.h" #define DataHeader "UU" 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 e0afdd435..6523b9dad 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -15,7 +15,6 @@ * with this program. If not, see . */ -#include "CreatureScript.h" #include "InstanceMapScript.h" #include "Player.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 2b1ca9868..745909342 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -19,6 +19,7 @@ #include "CreatureScript.h" #include "GameObjectAI.h" #include "ScriptedCreature.h" +#include "SpellScript.h" #include "SpellScriptLoader.h" #include "Vehicle.h" diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h index 0437252cd..23f3bddb1 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h @@ -19,7 +19,6 @@ #define DEF_UTGARDE_KEEP_H #include "CreatureAIImpl.h" -#include "SpellScript.h" #define UtgardeKeepScriptName "instance_utgarde_keep" diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h index ce37fa561..21f5eadd5 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h @@ -19,7 +19,6 @@ #define DEF_PINNACLE_H #include "CreatureAIImpl.h" -#include "Opcodes.h" #define DataHeader "UP" 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 25bb5ba51..8cdb21947 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -17,7 +17,6 @@ #include "Battlefield.h" #include "BattlefieldMgr.h" -#include "CreatureScript.h" #include "GameTime.h" #include "InstanceMapScript.h" #include "Player.h"