Scripts/Battlefields: moved scripts into their respective namespace

The-Cataclysm-Preservation-Project · Dec 8, 2023 · 714d93c · 714d93c
1 parent c494ec1
commit 714d93c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 11 deletions.
diff --git a/src/server/scripts/Battlefield/BattlefieldTB.cpp b/src/server/scripts/Battlefield/BattlefieldTB.cpp
@@ -35,6 +35,8 @@
 #include "World.h"
 #include "WorldStateMgr.h"
 
+namespace Battlefields::TB
+{
 const uint32 TBFactions[BG_TEAMS_COUNT] = { 1610, 1732 };
 
 // Stalker
@@ -984,8 +986,10 @@ class Battlefield_tol_barad : public BattlefieldScript
         return new BattlefieldTB(map);
     }
 };
+}
 
 void AddSC_BF_tol_barad()
 {
+    using namespace Battlefields::TB;
     new Battlefield_tol_barad();
 }
diff --git a/src/server/scripts/Battlefield/BattlefieldTB.h b/src/server/scripts/Battlefield/BattlefieldTB.h
@@ -20,9 +20,6 @@
 
 #include "Battlefield.h"
 
-class BattlefieldTB;
-class TolBaradCapturePoint;
-
 namespace WorldPackets
 {
     namespace WorldState
@@ -31,6 +28,11 @@ namespace WorldPackets
     }
 }
 
+namespace Battlefields::TB
+{
+class BattlefieldTB;
+class TolBaradCapturePoint;
+
 enum TolBaradInfo
 {
     BATTLEFIELD_TB_MAPID = 732, // Tol Barad
@@ -416,5 +418,6 @@ class BattlefieldTB : public Battlefield
         ObjectGuid m_gateDBlockGUID;
         ObjectGuid m_gateCursedDepthsGUID;
 };
+}
 
 #endif
diff --git a/src/server/scripts/Battlefield/BattlefieldWG.cpp b/src/server/scripts/Battlefield/BattlefieldWG.cpp
@@ -40,6 +40,8 @@
 #include "WorldSession.h"
 #include "WorldStateMgr.h"
 
+namespace Battlefields::WG
+{
 struct BfWGCoordGY
 {
     Position Pos;
@@ -1801,9 +1803,11 @@ class npc_wg_give_promotion_credit : public CreatureScript
         return new npc_wg_give_promotion_creditAI(creature);
     }
 };
+}
 
 void AddSC_BF_wintergrasp()
 {
+    using namespace Battlefields::WG;
     new Battlefield_wintergrasp();
     new npc_wg_give_promotion_credit();
 }
diff --git a/src/server/scripts/Battlefield/BattlefieldWG.h b/src/server/scripts/Battlefield/BattlefieldWG.h
@@ -21,14 +21,6 @@
 #include "Battlefield.h"
 
 class Group;
-class BattlefieldWG;
-class WintergraspCapturePoint;
-
-struct BfWGGameObjectBuilding;
-struct WintergraspWorkshop;
-struct StaticWintergraspTowerInfo;
-struct StaticWintergraspWorkshopInfo;
-struct WintergraspObjectPositionData;
 
 namespace WorldPackets
 {
@@ -39,6 +31,17 @@ namespace WorldPackets
 }
 
 
+namespace Battlefields::WG
+{
+class BattlefieldWG;
+class WintergraspCapturePoint;
+struct BfWGGameObjectBuilding;
+struct WintergraspWorkshop;
+struct StaticWintergraspTowerInfo;
+struct StaticWintergraspWorkshopInfo;
+struct WintergraspObjectPositionData;
+
+
 typedef std::vector<BfWGGameObjectBuilding*> GameObjectBuildingVect;
 typedef std::vector<WintergraspWorkshop*> WorkshopVect;
 
@@ -555,5 +558,6 @@ struct WintergraspWorkshop
 
     void UpdateGraveyardAndWorkshop();
 };
+}
 
 #endif
diff --git a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp
@@ -23,6 +23,10 @@
 #include "ScriptedGossip.h"
 #include "SpellScript.h"
 
+namespace TolBarad
+{
+using namespace Battlefields::TB;
+
 enum TBSpiritGuide
 {
     SPELL_CHANNEL_SPIRIT_HEAL = 22011,
@@ -144,9 +148,11 @@ class spell_tb_scrap_master_summon : public SpellScript
         OnEffectHitTarget.Register(&spell_tb_scrap_master_summon::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
     }
 };
+}
 
 void AddSC_tol_barad()
 {
+    using namespace TolBarad;
     new npc_tb_spirit_guide();
     new spell_siege_cannon();
     RegisterSpellScript(spell_tb_scrap_master_summon);

diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp
@@ -30,6 +30,10 @@
 #include "Vehicle.h"
 #include "WorldSession.h"
 
+namespace Wintergrasp
+{
+using namespace Battlefields::WG;
+
 #define GOSSIP_HELLO_DEMO1  "Build catapult."
 #define GOSSIP_HELLO_DEMO2  "Build demolisher."
 #define GOSSIP_HELLO_DEMO3  "Build siege engine."
@@ -575,9 +579,11 @@ class condition_is_wintergrasp_alliance : public ConditionScript
             return false;
         }
 };
+}
 
 void AddSC_wintergrasp()
 {
+    using namespace Wintergrasp;
     new npc_wg_queue();
     new npc_wg_spirit_guide();
     new npc_wg_demolisher_engineer();