From dc3dfd3ab0108ce1682727f69a1b8c31d8e293bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Sat, 27 Jul 2024 00:58:11 +0200 Subject: [PATCH] refactor(Scripts/Kalimdor): remove unused imports (#19459) * refactor(Scripts/Kalimdor): remove unused imports * chore: remove duplicate blank line * chore: damn linking issue * chore: wip * chore: wip * chore: wip --- .../BlackfathomDeeps/instance_blackfathom_deeps.cpp | 1 - .../BattleForMountHyjal/boss_archimonde.cpp | 2 +- .../CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp | 1 + .../BattleForMountHyjal/boss_kazrogal.cpp | 1 + .../Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h | 1 - .../BattleForMountHyjal/instance_hyjal.cpp | 1 - .../CavernsOfTime/TheBlackMorass/the_black_morass.cpp | 2 ++ .../CavernsOfTime/TheBlackMorass/the_black_morass.h | 2 -- .../scripts/Kalimdor/Maraudon/instance_maraudon.cpp | 1 - .../scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp | 8 +++++++- .../scripts/Kalimdor/RazorfenDowns/razorfen_downs.h | 1 - .../scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp | 1 - .../WailingCaverns/instance_wailing_caverns.cpp | 1 - .../scripts/Kalimdor/WailingCaverns/wailing_caverns.h | 2 -- .../scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp | 2 ++ src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp | 10 ++++++++-- src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h | 2 -- src/server/scripts/Kalimdor/zone_azshara.cpp | 1 - src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp | 1 - src/server/scripts/Kalimdor/zone_feralas.cpp | 1 - src/server/scripts/Kalimdor/zone_moonglade.cpp | 1 - 21 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index 280e5b05b..3a3d7d6ff 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -15,7 +15,6 @@ * with this program. If not, see . */ -#include "CreatureScript.h" #include "InstanceMapScript.h" #include "InstanceScript.h" #include "blackfathom_deeps.h" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index e1399873d..cab91dd88 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -16,10 +16,10 @@ */ #include "CreatureScript.h" +#include "GridNotifiers.h" #include "Player.h" #include "ScriptedCreature.h" #include "SpellAuraEffects.h" -#include "SpellAuras.h" #include "SpellScript.h" #include "SpellScriptLoader.h" #include "hyjal.h" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 72ac29996..82f86f1b5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -16,6 +16,7 @@ */ #include "CreatureScript.h" +#include "GridNotifiers.h" #include "ScriptedCreature.h" #include "SpellScript.h" #include "SpellScriptLoader.h" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 37fc84809..09003b022 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -16,6 +16,7 @@ */ #include "CreatureScript.h" +#include "GridNotifiers.h" #include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h index f29a56eb2..54ba1eab3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h @@ -19,7 +19,6 @@ #define DEF_HYJAL_H #include "CreatureAIImpl.h" -#include "GridNotifiers.h" #define DataHeader "HY" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 1228665c7..431892aad 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -18,7 +18,6 @@ #include "Chat.h" #include "InstanceMapScript.h" #include "InstanceScript.h" -#include "Opcodes.h" #include "Player.h" #include "WorldPacket.h" #include "hyjal.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 34d43737f..1955c3b5d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -18,8 +18,10 @@ #include "the_black_morass.h" #include "CreatureScript.h" #include "MoveSplineInit.h" +#include "PassiveAI.h" #include "ScriptedCreature.h" #include "SmartAI.h" +#include "SpellScript.h" #include "SpellScriptLoader.h" enum medivhMisc diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h index 3a8715a34..0eac0cb3f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h @@ -19,8 +19,6 @@ #define DEF_THEBLACKMORASS_H #include "CreatureAIImpl.h" -#include "PassiveAI.h" -#include "SpellScript.h" #define DataHeader "TBM" diff --git a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp index 02f1b708b..9e4f79b38 100644 --- a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp @@ -15,7 +15,6 @@ * with this program. If not, see . */ -#include "CreatureScript.h" #include "InstanceMapScript.h" #include "InstanceScript.h" #include "maraudon.h" diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index f9b5d9377..3504b6cdb 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -20,10 +20,16 @@ #include "CellImpl.h" #include "CreatureScript.h" #include "GridNotifiers.h" -#include "GridNotifiersImpl.h" +#include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.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" + /*###### ## 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 259c26d43..77c963a5b 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h @@ -19,7 +19,6 @@ #define DEF_RAZORFEN_DOWNS_H #include "CreatureAIImpl.h" -#include "PassiveAI.h" #define DataHeader "RFD" diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index b43894d2d..7b56c464d 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -19,7 +19,6 @@ #include "GameObjectAI.h" #include "GameObjectScript.h" #include "MiscPackets.h" -#include "Opcodes.h" #include "Player.h" #include "ScriptedCreature.h" #include "SpellInfo.h" diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index fe9ea41b4..b8097f4c1 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -15,7 +15,6 @@ * with this program. If not, see . */ -#include "CreatureScript.h" #include "InstanceMapScript.h" #include "InstanceScript.h" #include "wailing_caverns.h" diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h index 239e1eea7..e8887df72 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h @@ -20,8 +20,6 @@ #define DataHeader "WC" -#include "CreatureAI.h" - enum DataTypes { TYPE_LORD_COBRAHN = 0, diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index c15a77ba2..f8c76779b 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -16,10 +16,12 @@ */ #include "CreatureScript.h" +#include "CellImpl.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "InstanceMapScript.h" #include "InstanceScript.h" +#include "SpellScript.h" #include "SpellScriptLoader.h" #include "TemporarySummon.h" #include "zulfarrak.h" diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 9506c4794..4762a72b6 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -17,6 +17,7 @@ #include "zulfarrak.h" #include "Cell.h" +#include "CellImpl.h" #include "CreatureScript.h" #include "GameObject.h" #include "GameObjectAI.h" @@ -28,6 +29,13 @@ #include "ScriptSystem.h" #include "ScriptedCreature.h" #include "ScriptedGossip.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" + /* ScriptData SDName: Zulfarrak SD%Complete: 50 @@ -40,8 +48,6 @@ npc_sergeant_bly npc_weegli_blastfuse EndContentData */ -#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 3202de53e..ad2965baa 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h @@ -18,9 +18,7 @@ #ifndef DEF_ZULFARRACK_H #define DEF_ZULFARRACK_H -#include "CellImpl.h" #include "CreatureAIImpl.h" -#include "SpellScript.h" #define DataHeader "ZF" diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp index 8fbb8f62a..c8fb68c0a 100644 --- a/src/server/scripts/Kalimdor/zone_azshara.cpp +++ b/src/server/scripts/Kalimdor/zone_azshara.cpp @@ -31,7 +31,6 @@ EndContentData */ #include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "SpellInfo.h" /*#### # npc_rizzle_sprysprocket diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index 5439edc99..4d391d8b1 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -18,7 +18,6 @@ #include "CreatureScript.h" #include "Player.h" #include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "SpellScript.h" #include "SpellScriptLoader.h" diff --git a/src/server/scripts/Kalimdor/zone_feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp index 7352427a5..1b70c5485 100644 --- a/src/server/scripts/Kalimdor/zone_feralas.cpp +++ b/src/server/scripts/Kalimdor/zone_feralas.cpp @@ -18,7 +18,6 @@ #include "Group.h" #include "Player.h" #include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "SpellScript.h" #include "SpellScriptLoader.h" /* ScriptData diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index df9757da8..a5bfb69b0 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -31,7 +31,6 @@ npc_clintar_dreamwalker EndContentData */ #include "Cell.h" -#include "CellImpl.h" #include "CreatureScript.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h"