From e8bd391505ff1fca9801e7d986e09a60c03c9446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Tue, 23 Jul 2024 13:56:46 +0200 Subject: [PATCH] refactor(Scripts/EasternKingdoms): remove unused imports (#19457) --- .../BlackwingLair/boss_broodlord_lashlayer.cpp | 1 - .../BlackrockMountain/BlackwingLair/boss_chromaggus.cpp | 1 - .../EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp | 1 - src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp | 1 - .../MagistersTerrace/boss_felblood_kaelthas.cpp | 4 +++- .../EasternKingdoms/MagistersTerrace/magisters_terrace.h | 3 --- .../ShadowfangKeep/instance_shadowfang_keep.cpp | 2 ++ .../scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h | 2 -- src/server/scripts/EasternKingdoms/Stratholme/stratholme.h | 2 -- .../scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp | 4 ++++ .../EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp | 2 ++ .../scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp | 2 ++ .../scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp | 2 ++ .../scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp | 3 +++ .../scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp | 4 +++- .../SunwellPlateau/instance_sunwell_plateau.cpp | 1 + .../scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h | 4 ---- src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp | 1 - src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp | 1 - src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp | 1 - src/server/scripts/EasternKingdoms/zone_undercity.cpp | 1 - 21 files changed, 22 insertions(+), 21 deletions(-) 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 3a50ba724..558e0ba47 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -19,7 +19,6 @@ #include "GameObject.h" #include "GameObjectAI.h" #include "GameObjectScript.h" -#include "InstanceMapScript.h" #include "InstanceScript.h" #include "ScriptedCreature.h" #include "SpellScript.h" diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp index d948c1113..19fac9d23 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp @@ -19,7 +19,6 @@ #include "GameObject.h" #include "GameObjectAI.h" #include "GameObjectScript.h" -#include "InstanceMapScript.h" #include "InstanceScript.h" #include "Map.h" #include "Player.h" diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index 4ce157d35..4530fcb95 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -16,7 +16,6 @@ */ #include "CreatureScript.h" -#include "PassiveAI.h" #include "ScriptedCreature.h" #include "SpellInfo.h" #include "karazhan.h" diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 35c480498..4e93c8c46 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -23,7 +23,6 @@ #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" #include "SpellAuraEffects.h" -#include "SpellAuras.h" #include "SpellScript.h" #include "SpellScriptLoader.h" /* ScriptData diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 9a0ac2d6b..a66568bf5 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -16,10 +16,12 @@ */ #include "CreatureScript.h" -#include "Opcodes.h" #include "ScriptedCreature.h" #include "SpellScriptLoader.h" #include "magisters_terrace.h" +#include "MapReference.h" +#include "Player.h" +#include "SpellScript.h" enum Says { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h index e985711ac..f914a1d91 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h @@ -18,10 +18,7 @@ #ifndef DEF_MAGISTERS_TERRACE_H #define DEF_MAGISTERS_TERRACE_H -#include "CreatureAI.h" #include "CreatureAIImpl.h" -#include "Player.h" -#include "SpellScript.h" #define DataHeader "MT" #define MTScriptName "instance_magisters_terrace" diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 6d7a62b31..3ce654c6d 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -20,6 +20,8 @@ #include "SpellScriptLoader.h" #include "TemporarySummon.h" #include "shadowfang_keep.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h index 3d106f8fe..9639c9afc 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h @@ -19,8 +19,6 @@ #define DEF_SHADOWFANG_H #include "CreatureAIImpl.h" -#include "SpellAuraEffects.h" -#include "SpellScript.h" #define DataHeader "SK" #define ShadowfangKeepScriptName "instance_shadowfang_keep" diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h index c5f2ad479..d1200e326 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h @@ -18,8 +18,6 @@ #ifndef DEF_STRATHOLME_H #define DEF_STRATHOLME_H -#include "SpellAuras.h" - #define DataHeader "STR" #define StratholmeScriptName "instance_stratholme" diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 93e69d5b7..f0c132850 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -17,7 +17,11 @@ #include "AreaTriggerScript.h" #include "CreatureScript.h" +#include "MapReference.h" +#include "PassiveAI.h" +#include "Player.h" #include "ScriptedCreature.h" +#include "SpellScript.h" #include "SpellScriptLoader.h" #include "WorldSession.h" #include "sunwell_plateau.h" diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 046eba5c7..f58a12ad3 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -17,8 +17,10 @@ #include "AreaTriggerScript.h" #include "CreatureScript.h" +#include "Player.h" #include "ScriptedCreature.h" #include "SpellInfo.h" +#include "SpellScript.h" #include "SpellScriptLoader.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 eb0ef5752..141391888 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -19,7 +19,9 @@ #include "CellImpl.h" #include "CreatureScript.h" #include "GridNotifiers.h" +#include "PassiveAI.h" #include "ScriptedCreature.h" +#include "SpellScript.h" #include "SpellScriptLoader.h" #include "sunwell_plateau.h" diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index bc7bbd98a..306e758c9 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -18,6 +18,8 @@ #include "CreatureScript.h" #include "Player.h" #include "ScriptedCreature.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" #include "SpellScriptLoader.h" #include "WorldSession.h" #include "sunwell_plateau.h" diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index d3618e091..ba31822e9 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -18,7 +18,10 @@ #include "CreatureScript.h" #include "CreatureTextMgr.h" #include "MoveSplineInit.h" +#include "PassiveAI.h" #include "ScriptedCreature.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" #include "SpellScriptLoader.h" #include "sunwell_plateau.h" diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 4a317f7cb..1205691d3 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -16,9 +16,11 @@ */ #include "CreatureScript.h" +#include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" -#include "SpellInfo.h" +#include "SpellAuraEffects.h" +#include "SpellScript.h" #include "SpellScriptLoader.h" #include "sunwell_plateau.h" diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index fe5c2ea40..66a5a8926 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -18,6 +18,7 @@ #include "InstanceMapScript.h" #include "InstanceScript.h" #include "Player.h" +#include "SpellScript.h" #include "SpellScriptLoader.h" #include "sunwell_plateau.h" diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h index 1eb558cb6..d9a3af630 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h @@ -19,10 +19,6 @@ #define SUNWELL_PLATEAU_H #include "CreatureAIImpl.h" -#include "PassiveAI.h" -#include "Player.h" -#include "SpellAuraEffects.h" -#include "SpellScript.h" #define DataHeader "SWP" diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 25f92a7e8..84fcd4a2a 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -25,7 +25,6 @@ SQLUpdate: EndScriptData */ #include "Cell.h" -#include "CellImpl.h" #include "CreatureScript.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 091bff795..eecf14180 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -17,7 +17,6 @@ #include "CreatureScript.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "zulgurub.h" /* diff --git a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp index 5a4ec3eba..244d503b7 100644 --- a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp @@ -34,7 +34,6 @@ EndContentData */ #include "Player.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptedGossip.h" /*###### ## npc_lord_gregor_lescovar diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 41e93d9cc..d9495faf4 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -35,7 +35,6 @@ EndContentData */ #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" #include "SpellAuraEffects.h" -#include "SpellAuras.h" #include "SpellScript.h" #include "SpellScriptLoader.h"