Scripts/OutdoorPvP: moved scripts into their respective namespace

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

Hide file tree

Showing 10 changed files with 40 additions and 3 deletions.
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
@@ -25,6 +25,8 @@
 #include "WorldPacket.h"
 #include "WorldStatePackets.h"
 
+namespace OutdoorPvpScript::HP
+{
 uint32 const OutdoorPvPHPBuffZonesNum = 6;
  // HP, citadel, ramparts, blood furnace, shattered halls, mag's lair
 uint32 const OutdoorPvPHPBuffZones[OutdoorPvPHPBuffZonesNum] = { 3483, 3563, 3562, 3713, 3714, 3836 };
@@ -319,8 +321,10 @@ class OutdoorPvP_hellfire_peninsula : public OutdoorPvPScript
  return new OutdoorPvPHP(map);
  }
 };
+}
 
 void AddSC_outdoorpvp_hp()
 {
+ using namespace OutdoorPvpScript::HP;
  new OutdoorPvP_hellfire_peninsula();
 }
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
@@ -21,6 +21,8 @@
 #include "OutdoorPvP.h"
 #include <array>
 
+namespace OutdoorPvpScript::HP
+{
 enum DefenseMessages
 {
  TEXT_OVERLOOK_TAKEN_ALLIANCE = 14841, // '|cffffff00The Overlook has been taken by the Alliance!|r'
@@ -97,5 +99,6 @@ class OutdoorPvPHP : public OutdoorPvP
  uint32 m_HordeTowersControlled;
  std::array<ObjectGuid::LowType, HP_TOWER_NUM> m_towerFlagSpawnIds;
 };
+}
 
 #endif
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
@@ -28,6 +28,8 @@
 #include "WorldPacket.h"
 #include "WorldStatePackets.h"
 
+namespace OutdoorPvpScript::NA
+{
  // kill credit for pks
 uint32 const NA_CREDIT_MARKER = 24867; // kill credit for pks
 uint32 const NA_GUARDS_MAX = 15;
@@ -488,8 +490,10 @@ class OutdoorPvP_nagrand : public OutdoorPvPScript
  return new OutdoorPvPNA(map);
  }
 };
+}
 
 void AddSC_outdoorpvp_na()
 {
+ using namespace OutdoorPvpScript::NA;
  new OutdoorPvP_nagrand();
 }
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
@@ -28,6 +28,12 @@ namespace WorldPackets
  }
 }
 
+class Unit;
+class Creature;
+
+namespace OutdoorPvpScript::NA
+{
+
 enum DefenseMessages
 {
  TEXT_ALL_GUARDS_DEFEATED = 15017, // (NYI) '|cffffff00All the guards have been defeated!|r'
@@ -121,9 +127,6 @@ enum HalaaStates
  HALAA_H = 16
 };
 
-class Unit;
-class Creature;
-
 class OPvPCapturePointNA : public OPvPCapturePoint
 {
  public:
@@ -170,5 +173,6 @@ class OutdoorPvPNA : public OutdoorPvP
  private:
  OPvPCapturePointNA * m_obj;
 };
+}
 
 #endif
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
@@ -31,6 +31,8 @@
 #include "WorldPacket.h"
 #include "WorldStatePackets.h"
 
+namespace OutdoorPvpScript::SI
+{
 constexpr int32 SI_MAX_RESOURCES = 200;
 uint32 const SI_AREATRIGGER_H = 4168;
 uint32 const SI_AREATRIGGER_A = 4162;
@@ -248,8 +250,10 @@ class OutdoorPvP_silithus : public OutdoorPvPScript
  return new OutdoorPvPSI(map);
  }
 };
+}
 
 void AddSC_outdoorpvp_si()
 {
+ using namespace OutdoorPvpScript::SI;
  new OutdoorPvP_silithus();
 }
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
@@ -28,6 +28,9 @@ namespace WorldPackets
  }
 }
 
+namespace OutdoorPvpScript::SI
+{
+
 enum OutdoorPvPSISpells
 {
  SI_SILITHYST_FLAG_GO_SPELL = 29518,
@@ -61,5 +64,6 @@ class OutdoorPvPSI : public OutdoorPvP
  private:
  uint32 m_LastController;
 };
+}
 
 #endif
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
@@ -27,6 +27,8 @@
 #include "WorldPacket.h"
 #include "WorldStatePackets.h"
 
+namespace OutdoorPvpScript::TF
+{
 uint8 const OutdoorPvPTFBuffZonesNum = 5;
 uint32 const OutdoorPvPTFBuffZones[OutdoorPvPTFBuffZonesNum] =
 {
@@ -390,8 +392,10 @@ class OutdoorPvP_terokkar_forest : public OutdoorPvPScript
  return new OutdoorPvPTF(map);
  }
 };
+}
 
 void AddSC_outdoorpvp_tf()
 {
+ using namespace OutdoorPvpScript::TF;
  new OutdoorPvP_terokkar_forest();
 }
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
@@ -28,6 +28,8 @@ namespace WorldPackets
  }
 }
 
+namespace OutdoorPvpScript::TF
+{
 enum DefenseMessages
 {
  TEXT_BONE_WASTES_TAKEN_ALLIANCE = 16120, // (NYI) '|cffffff00The Alliance has taken control of The Bone Wastes!|r'
@@ -118,5 +120,6 @@ class OutdoorPvPTF : public OutdoorPvP
 
  uint32 hours_left, second_digit, first_digit;
 };
+}
 
 #endif
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
@@ -28,6 +28,8 @@
 #include "WorldStatePackets.h"
 #include "GossipDef.h"
 
+namespace OutdoorPvpScript::ZM
+{
 uint8 const OutdoorPvPZMBuffZonesNum = 5;
 
 // the buff is cast in these zones
@@ -449,8 +451,10 @@ class OutdoorPvP_zangarmarsh : public OutdoorPvPScript
  return new OutdoorPvPZM(map);
  }
 };
+}
 
 void AddSC_outdoorpvp_zm()
 {
+ using namespace OutdoorPvpScript::ZM;
  new OutdoorPvP_zangarmarsh();
 }
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
@@ -28,6 +28,8 @@ namespace WorldPackets
  }
 }
 
+namespace OutdoorPvpScript::ZM
+{
 enum DefenseMessages
 {
  TEXT_WEST_BEACON_TAKEN_ALLIANCE = 15541, // '|cffffff00The Alliance has taken control of the West Beacon!|r'
@@ -171,6 +173,7 @@ class OutdoorPvPZM : public OutdoorPvP
  uint32 m_AllianceTowersControlled;
  uint32 m_HordeTowersControlled;
 };
+}
 
 /// @todo flag carrier death/leave/mount/activitychange should give back the gossip options
 #endif