Scripts/Instances: converted DataHeader macro to constexpr to keep their definition within their namespace

2023-12-10 02:22:54 +01:00
1 parent 96b2c70c04
commit 65218b02f9
@@ -22,7 +22,7 @@

 namespace BaradinHold
 {
-#define DataHeader "BH"
+constexpr char const* DataHeader = "BH";
 #define BHScriptName "instance_baradin_hold"

 uint32 const EncounterCount = 3;
@@ -22,7 +22,7 @@

 namespace BastionOfTwilight
 {
-#define DataHeader "BoT"
+constexpr char const* DataHeader = "BoT";
 #define BoTScriptName "instance_bastion_of_twilight"

 uint32 const EncounterCountNormal = 4;
@@ -24,7 +24,7 @@
 namespace BlackrockCaverns
 {
 #define BCScriptName "instance_blackrock_caverns"
-#define DataHeader "BRC"
+constexpr char const* DataHeader = "BRC";

 uint32 const EncounterCount             = 5;

@@ -23,7 +23,7 @@
 namespace BlackrockDepths
 {
 #define BRDScriptName "instance_blackrock_depths"
-#define DataHeader "BRD"
+constexpr char const* DataHeader = "BRD";

 enum BRDFactionIds
 {
@@ -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
 {
@@ -22,7 +22,7 @@

 namespace BlackwingDescent
 {
-#define DataHeader "BWD"
+constexpr char const* DataHeader = "BWD";
 #define BWDScriptName "instance_blackwing_descent"

 uint32 const EncounterCount = 6;
@@ -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
 {
@@ -25,7 +25,7 @@ struct Position;
 namespace MoltenCore
 {
 #define MCScriptName "instance_molten_core"
-#define DataHeader "MC"
+constexpr char const* DataHeader = "MC";

 enum MCEncounters
 {
@@ -23,7 +23,7 @@

 namespace Deadmines
 {
-#define DataHeader "DM"
+constexpr char const* DataHeader = "DM";
 #define DMScriptName "instance_deadmines"

 uint32 const EncounterCount = 6;
@@ -23,7 +23,7 @@
 namespace Gnomeregan
 {
 #define GNOScriptName "instance_gnomeregan"
-#define DataHeader "GNO"
+constexpr char const* DataHeader = "GNO";

 enum GNOGameObjectIds
 {
@@ -23,7 +23,7 @@
 namespace GrimBatol
 {
 #define GBScriptName "instance_grim_batol"
-#define DataHeader   "GB"
+constexpr char const* DataHeader =   "GB";

 uint32 const EncounterCount = 5;

@@ -23,7 +23,7 @@
 namespace Karazhan
 {
 #define KZScriptName "instance_karazhan"
-#define DataHeader "KZ"
+constexpr char const* DataHeader = "KZ";

 uint32 const EncounterCount = 12;

@@ -23,7 +23,7 @@
 namespace MagistersTerrace
 {
 #define MGTScriptName "instance_magisters_terrace"
-#define DataHeader "MT"
+constexpr char const* DataHeader = "MT";

 uint32 const EncounterCount = 4;

@@ -23,7 +23,7 @@
 namespace ScarletMonastery
 {
 #define SMScriptName "instance_scarlet_monastery"
-#define DataHeader "SM"
+constexpr char const* DataHeader = "SM";

 uint32 const EncounterCount = 10;

@@ -23,7 +23,7 @@
 namespace Scholomance
 {
 #define ScholomanceScriptName "instance_scholomance"
-#define DataHeader "SC"
+constexpr char const* DataHeader = "SC";

 uint32 const EncounterCount             = 8;

@@ -23,7 +23,7 @@

 namespace ShadowfangKeep
 {
-#define DataHeader "SK"
+constexpr char const* DataHeader = "SK";
 #define SKScriptName "instance_shadowfang_keep"

 uint32 const EncounterCount = 7;
@@ -23,7 +23,7 @@
 namespace Stratholme
 {
 #define StratholmeScriptName "instance_stratholme"
-#define DataHeader "STR"
+constexpr char const* DataHeader = "STR";

 enum STRData
 {
@@ -23,7 +23,7 @@
 namespace SunkenTemple
 {
 #define STScriptName "instance_sunken_temple"
-#define DataHeader "ST"
+constexpr char const* DataHeader = "ST";

 enum STEvents
 {
@@ -23,7 +23,7 @@
 namespace SunwellPlateau
 {
 #define SunwellPlateauScriptName "instance_sunwell_plateau"
-#define DataHeader "SWP"
+constexpr char const* DataHeader = "SWP";

 uint32 const EncounterCount = 6;

@@ -24,7 +24,7 @@
 namespace TheStockade
 {
 #define StormwindStockadeScriptName "instance_the_stockade"
-#define DataHeader "SS"
+constexpr char const* DataHeader = "SS";

 uint32 const EncounterCount = 3;

@@ -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;

@@ -23,7 +23,7 @@
 namespace Uldaman
 {
 #define UldamanScriptName "instance_uldaman"
-#define DataHeader "UD"
+constexpr char const* DataHeader = "UD";

 #define MAX_ENCOUNTER                   3

@@ -24,7 +24,7 @@ namespace ZulAman
 {
 uint32 const EncounterCount = 6;
 #define ZulAmanScriptName "instance_zulaman"
-#define DataHeader "ZA"
+constexpr char const* DataHeader = "ZA";

 enum ZADataTypes
 {
@@ -20,7 +20,7 @@

 #include "CreatureAIImpl.h"

-#define DataHeader "ZG"
+constexpr char const* DataHeader = "ZG";
 #define ZGScriptName "instance_zulgurub"

 namespace ZulGurub
@@ -23,7 +23,7 @@
 namespace BlackfathomDeeps
 {
 #define BFDScriptName "instance_blackfathom_deeps"
-#define DataHeader "BFD"
+constexpr char const* DataHeader = "BFD";

 uint32 const EncounterCount = 3;

@@ -23,7 +23,7 @@
 namespace BattleForMountHyjal
 {
 #define HyjalScriptName "instance_hyjal"
-#define DataHeader "HY"
+constexpr char const* DataHeader = "HY";

 uint32 const EncounterCount     = 5;

@@ -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;
@@ -24,7 +24,7 @@

 namespace DragonSoul
 {
-#define DataHeader "DS"
+constexpr char const* DataHeader = "DS";
 #define DSScriptName "instance_dragon_soul"

 uint32 const EncounterCount = 8;
@@ -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;
@@ -23,7 +23,7 @@
 namespace EscapeFromDurnholdeKeep
 {
 #define OHScriptName "instance_old_hillsbrad"
-#define DataHeader "OH"
+constexpr char const* DataHeader = "OH";

 enum OHDataTypes
 {
@@ -23,7 +23,7 @@

 namespace HourOfTwilight
 {
-#define DataHeader "HOT"
+constexpr char const* DataHeader = "HOT";
 #define HOTScriptName "instance_hour_of_twilight"

 uint32 const EncounterCount = 3;
@@ -23,7 +23,7 @@
 namespace TheBlackMorass
 {
 #define TBMScriptName "instance_the_black_morass"
-#define DataHeader "TBM"
+constexpr char const* DataHeader = "TBM";

 uint32 const EncounterCount             = 2;

@@ -23,7 +23,7 @@

 namespace WellOfEternity
 {
-#define DataHeader "WOE"
+constexpr char const* DataHeader = "WOE";
 #define WOEScriptName "instance_well_of_eternity"

    uint32 const EncounterCount = 3;
@@ -24,7 +24,7 @@

 namespace Firelands
 {
-#define DataHeader "FL"
+constexpr char const* DataHeader = "FL";
 #define FirelandsScriptName "instance_firelands"

 uint32 const EncounterCount = 7;
@@ -23,7 +23,7 @@

 namespace HallsOfOrigination
 {
-#define DataHeader "HOO"
+constexpr char const* DataHeader = "HOO";
 #define HoOScriptName "instance_halls_of_origination"

 uint32 const EncounterCount = 12;
@@ -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;

@@ -23,7 +23,7 @@
 namespace OnyxiasLair
 {
 #define OnyxiaScriptName "instance_onyxias_lair"
-#define DataHeader "OL"
+constexpr char const* DataHeader = "OL";

 uint32 const EncounterCount     = 1;

@@ -23,7 +23,7 @@
 namespace RagefireChasm
 {
 #define RCScriptName "instance_ragefire_chasm"
-#define DataHeader   "RC"
+constexpr char const* DataHeader = "RC";

 uint32 const EncounterCount = 4;

@@ -23,7 +23,7 @@
 namespace RazorfenDowns
 {
 #define RFDScriptName "instance_razorfen_downs"
-#define DataHeader "RFD"
+constexpr char const* DataHeader = "RFD";

 uint32 const EncounterCount = 5;

@@ -20,7 +20,7 @@

 namespace RazorfenKraul
 {
-#define DataHeader "RFK"
+constexpr char const* DataHeader = "RFK";

 #define EVENT_WARD_KEEPER 1
 }
@@ -23,7 +23,7 @@
 namespace RuinsOfAhnQiraj
 {
 #define AQ20ScriptName "instance_ruins_of_ahnqiraj"
-#define DataHeader "AQR"
+constexpr char const* DataHeader = "AQR";

 enum AQRDataTypes
 {
@@ -23,7 +23,7 @@
 namespace TempleOfAhnqiraj
 {
 #define AQ40ScriptName "instance_temple_of_ahnqiraj"
-#define DataHeader "AQT"
+constexpr char const* DataHeader = "AQT";

 uint32 const EncounterCount = 9;

@@ -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;

@@ -23,7 +23,7 @@
 namespace VortexPinnacle
 {
 #define VPScriptName "instance_vortex_pinnacle"
-#define DataHeader "VP"
+constexpr char const* DataHeader = "VP";

 uint32 const PrismGroundingFieldPoints = 3;

@@ -22,7 +22,7 @@

 namespace WailingCaverns
 {
-#define DataHeader "WC"
+    constexpr char const* DataHeader = "WC";
 #define WCScriptName "instance_wailing_caverns"

 uint32 const EncounterCount = 8;
@@ -23,7 +23,7 @@
 namespace Zulfarrak
 {
 #define ZFScriptName "instance_zulfarrak"
-#define DataHeader "ZF"
+constexpr char const* DataHeader = "ZF";

 enum ZFEntries
 {
@@ -25,7 +25,7 @@ namespace Stonecore
 {

 #define SCScriptName "instance_stonecore"
-#define DataHeader "SC"
+constexpr char const* DataHeader = "SC";

 enum SCDataTypes
 {
@@ -23,7 +23,7 @@
 namespace Ankahet
 {
 #define AhnKahetScriptName "instance_ahnkahet"
-#define DataHeader         "AK"
+constexpr char const* DataHeader = "AK";

 uint32 const EncounterCount = 5;

@@ -23,7 +23,7 @@
 namespace AzjolNerub
 {
 #define AzjolNerubScriptName "instance_azjol_nerub"
-#define DataHeader           "AN"
+constexpr char const* DataHeader = "AN";

 uint32 const EncounterCount = 3;

@@ -21,7 +21,7 @@
 #include "CreatureAIImpl.h"

 #define OSScriptName "instance_obsidian_sanctum"
-#define DataHeader "OS"
+constexpr char const* DataHeader = "OS";

 namespace ObsidianSanctum
 {
@@ -20,11 +20,11 @@

 #include "CreatureAIImpl.h"

-#define RSScriptName "instance_ruby_sanctum"
-#define DataHeader "RS"
-
 namespace RubySanctum
 {
+#define RSScriptName "instance_ruby_sanctum"
+constexpr char const* DataHeader = "RS";
+
 uint32 const EncounterCount = 4;

 enum RSDataTypes
@@ -23,7 +23,7 @@
 namespace TrialOfTheChampion
 {
 #define ToCScriptName "instance_trial_of_the_champion"
-#define DataHeader "TC"
+constexpr char const* DataHeader = "TC";

 enum TCData
 {
@@ -25,7 +25,7 @@ struct Position;
 namespace TrialOfTheCrusader
 {
 #define ToCrScriptName "instance_trial_of_the_crusader"
-#define DataHeader "TCR"
+constexpr char const* DataHeader = "TCR";

 enum TCRDataTypes
 {
@@ -23,7 +23,7 @@
 namespace DrakTharonKeep
 {
 #define DrakTharonKeepScriptName "instance_drak_tharon_keep"
-#define DataHeader               "DTK"
+constexpr char const* DataHeader = "DTK";

 uint32 const EncounterCount = 4;

@@ -23,7 +23,7 @@
 namespace ForgeOfSouls
 {
 #define FoSScriptName "instance_forge_of_souls"
-#define DataHeader    "FOS"
+constexpr char const* DataHeader = "FOS";

 uint32 const EncounterCount = 2;

@@ -25,7 +25,7 @@
 namespace HallsOfReflection
 {
 #define HoRScriptName "instance_halls_of_reflection"
-#define DataHeader    "HOR"
+constexpr char const* DataHeader = "HOR";

 uint32 const EncounterCount = 3;

@@ -24,7 +24,7 @@
 namespace PitOfSaron
 {
 #define PoSScriptName "instance_pit_of_saron"
-#define DataHeader "POS"
+constexpr char const* DataHeader = "POS";

 uint32 const EncounterCount = 3;

@@ -23,7 +23,7 @@
 namespace Gundrak
 {
 #define GundrakScriptName "instance_gundrak"
-#define DataHeader "GD"
+constexpr char const* DataHeader = "GD";

 uint32 const EncounterCount = 5;

@@ -27,7 +27,7 @@ enum TriggerCastFlags : uint32;
 namespace IcecrownCitadel
 {
 #define ICCScriptName "instance_icecrown_citadel"
-#define DataHeader    "IC"
+constexpr char const* DataHeader = "IC";

 uint32 const EncounterCount = 13;
 uint32 const WeeklyNPCs = 9;
@@ -23,7 +23,7 @@
 namespace Naxxramas
 {
 #define NaxxramasScriptName "instance_naxxramas"
-#define DataHeader "NAX"
+constexpr char const* DataHeader = "NAX";

 uint32 const EncounterCount     = 15;

@@ -23,7 +23,7 @@
 namespace EyeOfEternity
 {
 #define EoEScriptName "instance_eye_of_eternity"
-#define DataHeader "EOE"
+constexpr char const* DataHeader = "EOE";

 enum EOEInstanceData
 {
@@ -23,7 +23,7 @@
 namespace Nexus
 {
 #define NexusScriptName "instance_nexus"
-#define DataHeader "NEX"
+constexpr char const* DataHeader = "NEX";

 uint32 const EncounterCount = 5;

@@ -23,7 +23,7 @@
 namespace Oculus
 {
 #define OculusScriptName "instance_oculus"
-#define DataHeader "OC"
+constexpr char const* DataHeader = "OC";

 uint32 const EncounterCount = 4;

@@ -23,7 +23,7 @@
 namespace HallsOfLightning
 {
 #define HoLScriptName "instance_halls_of_lightning"
-#define DataHeader    "HOL"
+constexpr char const* DataHeader = "HOL";

 uint32 const EncounterCount = 4;

@@ -23,7 +23,7 @@
 namespace HallsOfStone
 {
 #define HoSScriptName "instance_halls_of_stone"
-#define DataHeader    "HOS"
+constexpr char const* DataHeader = "HOS";

 uint32 const EncounterCount = 4;

@@ -23,7 +23,7 @@
 namespace Ulduar
 {
 #define UlduarScriptName "instance_ulduar"
-#define DataHeader "UU"
+constexpr char const* DataHeader = "UU";

    namespace YoggSaron
    {
@@ -23,7 +23,7 @@
 namespace UtgardeKeep
 {
 #define UKScriptName "instance_utgarde_keep"
-#define DataHeader "UK"
+constexpr char const* DataHeader = "UK";

 uint32 const EncounterCount = 3;

@@ -23,7 +23,7 @@
 namespace UtgardePinnacle
 {
 #define UPScriptName "instance_utgarde_pinnacle"
-#define DataHeader "UP"
+constexpr char const* DataHeader = "UP";

 uint32 const EncounterCount = 4;

@@ -23,7 +23,7 @@
 namespace VaultOfArchavon
 {
 #define VoAScriptName "instance_vault_of_archavon"
-#define DataHeader "VA"
+constexpr char const* DataHeader = "VA";

 uint32 const EncounterCount = 4;

@@ -23,7 +23,7 @@
 namespace VioletHold
 {
 #define VioletHoldScriptName "instance_violet_hold"
-#define DataHeader "VH"
+constexpr char const* DataHeader = "VH";

 uint32 const EncounterCount = 3 + 6;

@@ -23,7 +23,7 @@
 namespace AuchenaiCrypts
 {
 #define ACScriptName "instance_auchenai_crypts"
-#define DataHeader   "AC"
+constexpr char const* DataHeader = "AC";

 uint32 const EncounterCount = 2;

@@ -23,7 +23,7 @@
 namespace ManaTombs
 {
 #define MTScriptName "instance_mana_tombs"
-#define DataHeader "MT"
+constexpr char const* DataHeader = "MT";

 uint32 const EncounterCount = 4;

@@ -23,7 +23,7 @@
 namespace SethekkHalls
 {
 #define SHScriptName "instance_sethekk_halls"
-#define DataHeader "SH"
+constexpr char const* DataHeader = "SH";

 uint32 const EncounterCount             = 3;

@@ -24,7 +24,7 @@
 namespace ShadowLabyrinth
 {
 #define SLScriptName "instance_shadow_labyrinth"
-#define DataHeader "SL"
+constexpr char const* DataHeader = "SL";

 uint32 const EncounterCount = 4;

@@ -23,7 +23,7 @@
 namespace BlackTemple
 {
 #define BTScriptName "instance_black_temple"
-#define DataHeader   "BT"
+constexpr char const* DataHeader = "BT";

 uint32 const EncounterCount         = 9;

@@ -23,7 +23,7 @@
 namespace SerpentShrine
 {
 #define SSCScriptName "instance_serpent_shrine"
-#define DataHeader "SS"
+constexpr char const* DataHeader = "SS";

 enum SSWaterEventState
 {
@@ -23,7 +23,7 @@
 namespace SteamVault
 {
 #define SteamVaultScriptName "instance_steam_vault"
-#define DataHeader "SV"
+constexpr char const* DataHeader = "SV";

 uint32 const EncounterCount = 3;

@@ -25,7 +25,7 @@ namespace TheSlavePens
 uint32 const EncounterCount               = 3;

 #define SPScriptName "instance_the_slave_pens"
-#define DataHeader "SP"
+constexpr char const* DataHeader = "SP";

 enum SPDataTypes
 {
@@ -23,7 +23,7 @@
 namespace GruulsLair
 {
 #define GLScriptName "instance_gruuls_lair"
-#define DataHeader   "GL"
+constexpr char const* DataHeader = "GL";

 uint32 const EncounterCount = 2;

@@ -23,7 +23,7 @@
 namespace BloodFurnace
 {
 #define BFScriptName "instance_blood_furnace"
-#define DataHeader   "BF"
+constexpr char const* DataHeader = "BF";

 uint32 const EncounterCount = 3;

@@ -23,7 +23,7 @@
 namespace HellfireRamparts
 {
 #define HRScriptName "instance_ramparts"
-#define DataHeader "HR"
+constexpr char const* DataHeader = "HR";

 uint32 const EncounterCount       = 4;

@@ -23,7 +23,7 @@
 namespace MagtheridonsLair
 {
 #define MLScriptName "instance_magtheridons_lair"
-#define DataHeader "ML"
+constexpr char const* DataHeader = "ML";

 uint32 const EncounterCount = 1;

@@ -23,7 +23,7 @@
 namespace ShatteredHalls
 {
 #define SHScriptName "instance_shattered_halls"
-#define DataHeader "SH"
+constexpr char const* DataHeader = "SH";

 uint32 const EncounterCount          = 4;
 uint32 const VictimCount             = 3;
@@ -23,7 +23,7 @@
 namespace Eye
 {
 #define TheEyeScriptName "instance_the_eye"
-#define DataHeader "TE"
+constexpr char const* DataHeader = "TE";

 uint32 const EncounterCount = 4;

@@ -23,7 +23,7 @@
 namespace Mechanar
 {
 #define MechanarScriptName "instance_mechanar"
-#define DataHeader "MR"
+constexpr char const* DataHeader = "MR";

 uint32 const EncounterCount             = 5;

@@ -24,7 +24,7 @@ namespace Arcatraz
 {

 #define ArcatrazScriptName "instance_arcatraz"
-#define DataHeader         "AZ"
+constexpr char const* DataHeader = "AZ";

 uint32 const EncounterCount = 4;

@@ -23,7 +23,7 @@
 namespace Botanica
 {
 #define BotanicaScriptName "instance_the_botanica"
-#define DataHeader "BC"
+constexpr char const* DataHeader = "BC";

 uint32 const EncounterCount = 5;