Scripts/Instances: converted DataHeader macro to constexpr to keep th…

…eir definition within their namespace
The-Cataclysm-Preservation-Project · Dec 10, 2023 · 65218b0 · 65218b0
1 parent 96b2c70
commit 65218b0
Show file tree

Hide file tree

Showing 87 changed files with 89 additions and 89 deletions.
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/baradin_hold.h b/src/server/scripts/EasternKingdoms/BaradinHold/baradin_hold.h
@@ -22,7 +22,7 @@
 
 namespace BaradinHold
 {
-#define DataHeader "BH"
+constexpr char const* DataHeader = "BH";
 #define BHScriptName "instance_baradin_hold"
 
 uint32 const EncounterCount = 3;

diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.h b/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.h
@@ -22,7 +22,7 @@
 
 namespace BastionOfTwilight
 {
-#define DataHeader "BoT"
+constexpr char const* DataHeader = "BoT";
 #define BoTScriptName "instance_bastion_of_twilight"
 
 uint32 const EncounterCountNormal = 4;

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
@@ -24,7 +24,7 @@
 namespace BlackrockCaverns
 {
 #define BCScriptName "instance_blackrock_caverns"
-#define DataHeader "BRC"
+constexpr char const* DataHeader = "BRC";
 
 uint32 const EncounterCount             = 5;
 

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
@@ -23,7 +23,7 @@
 namespace BlackrockDepths
 {
 #define BRDScriptName "instance_blackrock_depths"
-#define DataHeader "BRD"
+constexpr char const* DataHeader = "BRD";
 
 enum BRDFactionIds
 {

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
@@ -25,7 +25,7 @@ namespace BlackrockSpire
 uint32 const EncounterCount         = 23;
 
 #define BRSScriptName "instance_blackrock_spire"
-#define DataHeader    "BRS"
+constexpr char const* DataHeader =    "BRS";
 
 enum BRSDataTypes
 {

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.h
@@ -22,7 +22,7 @@
 
 namespace BlackwingDescent
 {
-#define DataHeader "BWD"
+constexpr char const* DataHeader = "BWD";
 #define BWDScriptName "instance_blackwing_descent"
 
 uint32 const EncounterCount = 6;

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
@@ -25,7 +25,7 @@ namespace BlackwingLair
 uint32 const EncounterCount     = 8;
 
 #define BRLScriptName "instance_blackwing_lair"
-#define DataHeader    "BWL"
+constexpr char const* DataHeader =    "BWL";
 
 enum BWLEncounter
 {

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
@@ -25,7 +25,7 @@ struct Position;
 namespace MoltenCore
 {
 #define MCScriptName "instance_molten_core"
-#define DataHeader "MC"
+constexpr char const* DataHeader = "MC";
 
 enum MCEncounters
 {

diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
@@ -23,7 +23,7 @@
 
 namespace Deadmines
 {
-#define DataHeader "DM"
+constexpr char const* DataHeader = "DM";
 #define DMScriptName "instance_deadmines"
 
 uint32 const EncounterCount = 6;

diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h
@@ -23,7 +23,7 @@
 namespace Gnomeregan
 {
 #define GNOScriptName "instance_gnomeregan"
-#define DataHeader "GNO"
+constexpr char const* DataHeader = "GNO";
 
 enum GNOGameObjectIds
 {

diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.h b/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.h
@@ -23,7 +23,7 @@
 namespace GrimBatol
 {
 #define GBScriptName "instance_grim_batol"
-#define DataHeader   "GB"
+constexpr char const* DataHeader =   "GB";
 
 uint32 const EncounterCount = 5;
 

diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
@@ -23,7 +23,7 @@
 namespace Karazhan
 {
 #define KZScriptName "instance_karazhan"
-#define DataHeader "KZ"
+constexpr char const* DataHeader = "KZ";
 
 uint32 const EncounterCount = 12;
 

diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
@@ -23,7 +23,7 @@
 namespace MagistersTerrace
 {
 #define MGTScriptName "instance_magisters_terrace"
-#define DataHeader "MT"
+constexpr char const* DataHeader = "MT";
 
 uint32 const EncounterCount = 4;
 

diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
@@ -23,7 +23,7 @@
 namespace ScarletMonastery
 {
 #define SMScriptName "instance_scarlet_monastery"
-#define DataHeader "SM"
+constexpr char const* DataHeader = "SM";
 
 uint32 const EncounterCount = 10;
 

diff --git a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
@@ -23,7 +23,7 @@
 namespace Scholomance
 {
 #define ScholomanceScriptName "instance_scholomance"
-#define DataHeader "SC"
+constexpr char const* DataHeader = "SC";
 
 uint32 const EncounterCount             = 8;
 

diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
@@ -23,7 +23,7 @@
 
 namespace ShadowfangKeep
 {
-#define DataHeader "SK"
+constexpr char const* DataHeader = "SK";
 #define SKScriptName "instance_shadowfang_keep"
 
 uint32 const EncounterCount = 7;

diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
@@ -23,7 +23,7 @@
 namespace Stratholme
 {
 #define StratholmeScriptName "instance_stratholme"
-#define DataHeader "STR"
+constexpr char const* DataHeader = "STR";
 
 enum STRData
 {

diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
@@ -23,7 +23,7 @@
 namespace SunkenTemple
 {
 #define STScriptName "instance_sunken_temple"
-#define DataHeader "ST"
+constexpr char const* DataHeader = "ST";
 
 enum STEvents
 {

diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
@@ -23,7 +23,7 @@
 namespace SunwellPlateau
 {
 #define SunwellPlateauScriptName "instance_sunwell_plateau"
-#define DataHeader "SWP"
+constexpr char const* DataHeader = "SWP";
 
 uint32 const EncounterCount = 6;
 

diff --git a/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h b/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h
@@ -24,7 +24,7 @@
 namespace TheStockade
 {
 #define StormwindStockadeScriptName "instance_the_stockade"
-#define DataHeader "SS"
+constexpr char const* DataHeader = "SS";
 
 uint32 const EncounterCount = 3;
 

diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.h b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.h
@@ -24,7 +24,7 @@
 namespace ThroneOfTheTides
 {
 #define TotTScriptName "instance_throne_of_the_tides"
-#define DataHeader "TOTT"
+constexpr char const* DataHeader = "TOTT";
 
 uint32 const EncounterCount = 4;
 

diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h
@@ -23,7 +23,7 @@
 namespace Uldaman
 {
 #define UldamanScriptName "instance_uldaman"
-#define DataHeader "UD"
+constexpr char const* DataHeader = "UD";
 
 #define MAX_ENCOUNTER                   3
 

diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
@@ -24,7 +24,7 @@ namespace ZulAman
 {
 uint32 const EncounterCount = 6;
 #define ZulAmanScriptName "instance_zulaman"
-#define DataHeader "ZA"
+constexpr char const* DataHeader = "ZA";
 
 enum ZADataTypes
 {

diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
@@ -20,7 +20,7 @@
 
 #include "CreatureAIImpl.h"
 
-#define DataHeader "ZG"
+constexpr char const* DataHeader = "ZG";
 #define ZGScriptName "instance_zulgurub"
 
 namespace ZulGurub

diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
@@ -23,7 +23,7 @@
 namespace BlackfathomDeeps
 {
 #define BFDScriptName "instance_blackfathom_deeps"
-#define DataHeader "BFD"
+constexpr char const* DataHeader = "BFD";
 
 uint32 const EncounterCount = 3;
 

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
@@ -23,7 +23,7 @@
 namespace BattleForMountHyjal
 {
 #define HyjalScriptName "instance_hyjal"
-#define DataHeader "HY"
+constexpr char const* DataHeader = "HY";
 
 uint32 const EncounterCount     = 5;
 

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
@@ -24,7 +24,7 @@ struct Position;
 
 namespace CullingOfStratholme
 {
-#define DataHeader "CS"
+constexpr char const* DataHeader = "CS";
 #define CoSScriptName "instance_culling_of_stratholme"
 
 uint32 constexpr EncounterCount = 5;

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/dragon_soul.h b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/dragon_soul.h
@@ -24,7 +24,7 @@
 
 namespace DragonSoul
 {
-#define DataHeader "DS"
+constexpr char const* DataHeader = "DS";
 #define DSScriptName "instance_dragon_soul"
 
 uint32 const EncounterCount = 8;

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/end_time.h b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/end_time.h
@@ -25,7 +25,7 @@ class Creature;
 
 namespace EndTime
 {
-#define DataHeader "ET"
+constexpr char const* DataHeader = "ET";
 #define ETScriptName "instance_end_time"
 
 uint32 const EncounterCount = 5;

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
@@ -23,7 +23,7 @@
 namespace EscapeFromDurnholdeKeep
 {
 #define OHScriptName "instance_old_hillsbrad"
-#define DataHeader "OH"
+constexpr char const* DataHeader = "OH";
 
 enum OHDataTypes
 {

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/HourOfTwilight/hour_of_twilight.h b/src/server/scripts/Kalimdor/CavernsOfTime/HourOfTwilight/hour_of_twilight.h
@@ -23,7 +23,7 @@
 
 namespace HourOfTwilight
 {
-#define DataHeader "HOT"
+constexpr char const* DataHeader = "HOT";
 #define HOTScriptName "instance_hour_of_twilight"
 
 uint32 const EncounterCount = 3;

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
@@ -23,7 +23,7 @@
 namespace TheBlackMorass
 {
 #define TBMScriptName "instance_the_black_morass"
-#define DataHeader "TBM"
+constexpr char const* DataHeader = "TBM";
 
 uint32 const EncounterCount             = 2;
 

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/WellOfEternity/well_of_eternity.h b/src/server/scripts/Kalimdor/CavernsOfTime/WellOfEternity/well_of_eternity.h
@@ -23,7 +23,7 @@
 
 namespace WellOfEternity
 {
-#define DataHeader "WOE"
+constexpr char const* DataHeader = "WOE";
 #define WOEScriptName "instance_well_of_eternity"
 
     uint32 const EncounterCount = 3;

diff --git a/src/server/scripts/Kalimdor/Firelands/firelands.h b/src/server/scripts/Kalimdor/Firelands/firelands.h
@@ -24,7 +24,7 @@
 
 namespace Firelands
 {
-#define DataHeader "FL"
+constexpr char const* DataHeader = "FL";
 #define FirelandsScriptName "instance_firelands"
 
 uint32 const EncounterCount = 7;

diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
@@ -23,7 +23,7 @@
 
 namespace HallsOfOrigination
 {
-#define DataHeader "HOO"
+constexpr char const* DataHeader = "HOO";
 #define HoOScriptName "instance_halls_of_origination"
 
 uint32 const EncounterCount = 12;

diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h
@@ -23,7 +23,7 @@
 namespace LostCityOfTheTolvir
 {
 #define LCTScriptName "instance_lost_city_of_the_tolvir"
-#define DataHeader   "LCT"
+constexpr char const* DataHeader = "LCT";
 
 uint32 const EncounterCount = 6;
 

diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
@@ -23,7 +23,7 @@
 namespace OnyxiasLair
 {
 #define OnyxiaScriptName "instance_onyxias_lair"
-#define DataHeader "OL"
+constexpr char const* DataHeader = "OL";
 
 uint32 const EncounterCount     = 1;
 

diff --git a/src/server/scripts/Kalimdor/RagefireChasm/ragefire_chasm.h b/src/server/scripts/Kalimdor/RagefireChasm/ragefire_chasm.h
@@ -23,7 +23,7 @@
 namespace RagefireChasm
 {
 #define RCScriptName "instance_ragefire_chasm"
-#define DataHeader   "RC"
+constexpr char const* DataHeader = "RC";
 
 uint32 const EncounterCount = 4;
 

diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
@@ -23,7 +23,7 @@
 namespace RazorfenDowns
 {
 #define RFDScriptName "instance_razorfen_downs"
-#define DataHeader "RFD"
+constexpr char const* DataHeader = "RFD";
 
 uint32 const EncounterCount = 5;
 

diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h
@@ -20,7 +20,7 @@
 
 namespace RazorfenKraul
 {
-#define DataHeader "RFK"
+constexpr char const* DataHeader = "RFK";
 
 #define EVENT_WARD_KEEPER 1
 }

diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
@@ -23,7 +23,7 @@
 namespace RuinsOfAhnQiraj
 {
 #define AQ20ScriptName "instance_ruins_of_ahnqiraj"
-#define DataHeader "AQR"
+constexpr char const* DataHeader = "AQR";
 
 enum AQRDataTypes
 {

diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
@@ -23,7 +23,7 @@
 namespace TempleOfAhnqiraj
 {
 #define AQ40ScriptName "instance_temple_of_ahnqiraj"
-#define DataHeader "AQT"
+constexpr char const* DataHeader = "AQT";
 
 uint32 const EncounterCount = 9;
 

diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.h b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.h
@@ -23,7 +23,7 @@
 namespace ThroneOfTheFourWinds
 {
 #define TotFWScriptName "instance_throne_of_the_four_winds"
-#define DataHeader   "TOTFW"
+constexpr char const* DataHeader =   "TOTFW";
 
 uint32 const EncounterCount = 2;
 

diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
@@ -23,7 +23,7 @@
 namespace VortexPinnacle
 {
 #define VPScriptName "instance_vortex_pinnacle"
-#define DataHeader "VP"
+constexpr char const* DataHeader = "VP";
 
 uint32 const PrismGroundingFieldPoints = 3;