From c1ac99cc5d6559cb426e583e83f2541a770cb07d Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Fri, 8 Dec 2023 20:02:14 +0100
Subject: [PATCH] Scripts/Pet: moved all scripts into their own respective
 namespaces

---
 src/server/scripts/Pet/pet_dk.cpp      | 4 ++++
 src/server/scripts/Pet/pet_generic.cpp | 4 ++++
 src/server/scripts/Pet/pet_hunter.cpp  | 4 ++++
 src/server/scripts/Pet/pet_mage.cpp    | 4 ++++
 src/server/scripts/Pet/pet_paladin.cpp | 4 ++++
 src/server/scripts/Pet/pet_priest.cpp  | 4 ++++
 src/server/scripts/Pet/pet_shaman.cpp  | 4 ++++
 7 files changed, 28 insertions(+)

diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp
index 419ec93e6e..b01ea590ae 100644
--- a/src/server/scripts/Pet/pet_dk.cpp
+++ b/src/server/scripts/Pet/pet_dk.cpp
@@ -28,6 +28,8 @@
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
 
+namespace Pets::DeathKnight
+{
 enum DeathKnightSpells
 {
     SPELL_DK_SUMMON_GARGOYLE_1      = 49206,
@@ -316,9 +318,11 @@ struct npc_pet_dk_rune_weapon : public AggressorAI
         DoCastSelf(SPELL_DANCING_RUNE_WEAPON_VISUAL);
     }
 };
+}
 
 void AddSC_deathknight_pet_scripts()
 {
+    using namespace Pets::DeathKnight;
     new npc_pet_dk_ebon_gargoyle();
     new npc_pet_dk_guardian();
     RegisterCreatureAI(npc_pet_dk_army_of_the_dead_ghoul);
diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp
index 1bab437dad..9725d2ef02 100644
--- a/src/server/scripts/Pet/pet_generic.cpp
+++ b/src/server/scripts/Pet/pet_generic.cpp
@@ -36,6 +36,8 @@
 #include "Player.h"
 #include "ScriptedCreature.h"
 
+namespace Pets::Generic
+{
 enum BabyBlizzardBearMisc
 {
     SPELL_BBB_PET_SIT = 61853,
@@ -430,9 +432,11 @@ struct npc_pet_gen_soul_trader : public ScriptedAI
             DoCast(owner, SPELL_ETHEREAL_ONSUMMON);
     }
 };
+}
 
 void AddSC_generic_pet_scripts()
 {
+    using namespace Pets::Generic;
     new npc_pet_gen_baby_blizzard_bear();
     new npc_pet_gen_egbert();
     new npc_pet_gen_pandaren_monk();
diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp
index 7f4d7e0067..94f72ec21d 100644
--- a/src/server/scripts/Pet/pet_hunter.cpp
+++ b/src/server/scripts/Pet/pet_hunter.cpp
@@ -27,6 +27,8 @@
 #include "SpellScript.h"
 #include "TemporarySummon.h"
 
+namespace Pets::Hunter
+{
 enum HunterSpells
 {
     SPELL_HUNTER_CRIPPLING_POISON       = 30981, // Viper
@@ -274,9 +276,11 @@ class spell_pet_culling_the_herd : public SpellScriptLoader
             return new spell_pet_culling_the_herd_AuraScript();
         }
 };
+}
 
 void AddSC_hunter_pet_scripts()
 {
+    using namespace Pets::Hunter;
     new npc_pet_hunter_snake_trap();
     new spell_pet_guard_dog();
     new spell_pet_silverback();
diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp
index c9022836dc..c4aa28afdf 100644
--- a/src/server/scripts/Pet/pet_mage.cpp
+++ b/src/server/scripts/Pet/pet_mage.cpp
@@ -27,6 +27,8 @@
 #include "ScriptedCreature.h"
 #include "TemporarySummon.h"
 
+namespace Pets::Mage
+{
 enum Spells
 {
     SPELL_INHERIT_MASTERS_THREAT_LIST   = 58838,
@@ -136,8 +138,10 @@ private:
     EventMap _events;
     float _angle;
 };
+}
 
 void AddSC_mage_pet_scripts()
 {
+    using namespace Pets::Mage;
     RegisterCreatureAI(npc_pet_mage_mirror_image);
 }
diff --git a/src/server/scripts/Pet/pet_paladin.cpp b/src/server/scripts/Pet/pet_paladin.cpp
index 0faef3b0bc..24ad249ace 100644
--- a/src/server/scripts/Pet/pet_paladin.cpp
+++ b/src/server/scripts/Pet/pet_paladin.cpp
@@ -27,6 +27,8 @@
 #include "PetAI.h"
 #include "ScriptedCreature.h"
 
+namespace Pets::Paladin
+{
 enum GuardianOfAncientKings
 {
     SPELL_ANCIENT_GUARDIAN                      = 86657,
@@ -54,8 +56,10 @@ struct npc_pet_pal_guardian_of_ancient_kings : public PetAI
         }
     }
 };
+}
 
 void AddSC_paladin_pet_script()
 {
+    using namespace Pets::Paladin;
     RegisterCreatureAI(npc_pet_pal_guardian_of_ancient_kings);
 }
diff --git a/src/server/scripts/Pet/pet_priest.cpp b/src/server/scripts/Pet/pet_priest.cpp
index 85e809989d..43c7810d8c 100644
--- a/src/server/scripts/Pet/pet_priest.cpp
+++ b/src/server/scripts/Pet/pet_priest.cpp
@@ -25,6 +25,8 @@
 #include "PassiveAI.h"
 #include "PetAI.h"
 
+namespace Pets::Priest
+{
 enum PriestSpells
 {
     SPELL_PRIEST_GLYPH_OF_SHADOWFIEND       = 58228,
@@ -82,9 +84,11 @@ class npc_pet_pri_shadowfiend : public CreatureScript
             return new npc_pet_pri_shadowfiendAI(creature);
         }
 };
+}
 
 void AddSC_priest_pet_scripts()
 {
+    using namespace Pets::Priest;
     new npc_pet_pri_lightwell();
     new npc_pet_pri_shadowfiend();
 }
diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp
index 99a4818502..16b7d1bc02 100644
--- a/src/server/scripts/Pet/pet_shaman.cpp
+++ b/src/server/scripts/Pet/pet_shaman.cpp
@@ -23,6 +23,8 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 
+namespace Pets::Shaman
+{
 enum ShamanSpells
 {
     SPELL_SHAMAN_ANGEREDEARTH   = 36213,
@@ -145,9 +147,11 @@ class npc_pet_shaman_fire_elemental : public CreatureScript
             return new npc_pet_shaman_fire_elementalAI(creature);
         }
 };
+}
 
 void AddSC_shaman_pet_scripts()
 {
+    using namespace Pets::Shaman;
     new npc_pet_shaman_earth_elemental();
     new npc_pet_shaman_fire_elemental();
 }