diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/baradin_hold.h b/src/server/scripts/EasternKingdoms/BaradinHold/baradin_hold.h index 5464a8b991..293007e550 100644 --- 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 index 676486a9b1..c983e6065b 100644 --- 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 index 047fdaf8bf..af49341fdf 100644 --- 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 index b99b95e4b8..20c8495615 100644 --- 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 index 279658e496..cc2248d3a3 100644 --- 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 index bbaa71629d..3e9b2094de 100644 --- 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 index e5a6be6170..80b7904605 100644 --- 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 index 9a4182056c..8cddc95173 100644 --- 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 index 0c01ea5b1e..d377e2cf15 100644 --- 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 index 673827adba..7b4b660f66 100644 --- 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 index 3395e11936..c581b98954 100644 --- 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 index 575c741d03..c605d43edd 100644 --- 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 index 1fa02c84db..aa7e5b88e5 100644 --- 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 index be2bb5b723..a4e982425b 100644 --- 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 index 2a017f1d07..1349a98e6b 100644 --- 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 index a8bf4dbb3c..f860ddc1cb 100644 --- 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 index f4b0affef9..28df9ac528 100644 --- 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 index fc5f0f5a26..a0f1f71cc1 100644 --- 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 index 1a97108230..12639f8a29 100644 --- 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 index a9d410e005..e7fd7fda49 100644 --- 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 index 14d6b931a5..0d3599d7a7 100644 --- 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 index 7fc2d59d01..18253b434b 100644 --- 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 index 0da15e05e6..a9b648e01f 100644 --- 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 index fccb7185c2..35fcfa46df 100644 --- 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 index 88bb40aa20..e0891581d3 100644 --- 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 index 652353238c..ff8de05b77 100644 --- 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 index d3a8256a3d..669cb25d26 100644 --- 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 index 3b5c09098f..c1485410db 100644 --- 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 index e06b97f166..890084eee9 100644 --- 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 index e2d2a7936d..3df20b4537 100644 --- 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 index 42ba324828..8685995957 100644 --- 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 index 743d15faf4..fd3b8a8407 100644 --- 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 index f3e727d926..689317b469 100644 --- 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 index 23206177d8..d3de416c6b 100644 --- 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 index c99431a69d..961d63c3fc 100644 --- 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 index 744ceda3c4..1c4bd13dd3 100644 --- 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 index 4180720e6f..3a758b986e 100644 --- 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 index 2989c198a8..a06f29f0a9 100644 --- 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 index 032b3c527b..b487f928cd 100644 --- 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 index 71e4934820..688e19578a 100644 --- 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 index 55c159c0f3..92bb90d3da 100644 --- 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 index 611e09eea2..42c1868498 100644 --- 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 index 5797adf283..342064c9a5 100644 --- 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 index e4d6bddb1a..caa421d1fb 100644 --- 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; diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h index f1bda23e8c..e30d5e0b8c 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h @@ -22,7 +22,7 @@ namespace WailingCaverns { -#define DataHeader "WC" + constexpr char const* DataHeader = "WC"; #define WCScriptName "instance_wailing_caverns" uint32 const EncounterCount = 8; diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h index 10432b3cc2..00fca280e1 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h @@ -23,7 +23,7 @@ namespace Zulfarrak { #define ZFScriptName "instance_zulfarrak" -#define DataHeader "ZF" +constexpr char const* DataHeader = "ZF"; enum ZFEntries { diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.h b/src/server/scripts/Maelstrom/Stonecore/stonecore.h index 5b471fecf8..f1f3fd79f8 100644 --- a/src/server/scripts/Maelstrom/Stonecore/stonecore.h +++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.h @@ -25,7 +25,7 @@ namespace Stonecore { #define SCScriptName "instance_stonecore" -#define DataHeader "SC" +constexpr char const* DataHeader = "SC"; enum SCDataTypes { diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h index 01d2931b5f..112e758af1 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h @@ -23,7 +23,7 @@ namespace Ankahet { #define AhnKahetScriptName "instance_ahnkahet" -#define DataHeader "AK" +constexpr char const* DataHeader = "AK"; uint32 const EncounterCount = 5; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h index 08dc6ddaf7..50ad65accc 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h @@ -23,7 +23,7 @@ namespace AzjolNerub { #define AzjolNerubScriptName "instance_azjol_nerub" -#define DataHeader "AN" +constexpr char const* DataHeader = "AN"; uint32 const EncounterCount = 3; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h index fb1606b3a3..79433e2b01 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h @@ -21,7 +21,7 @@ #include "CreatureAIImpl.h" #define OSScriptName "instance_obsidian_sanctum" -#define DataHeader "OS" +constexpr char const* DataHeader = "OS"; namespace ObsidianSanctum { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h index 6854033970..88472b1ec3 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h @@ -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 diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h index f960f15c3b..b5523f9b31 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h @@ -23,7 +23,7 @@ namespace TrialOfTheChampion { #define ToCScriptName "instance_trial_of_the_champion" -#define DataHeader "TC" +constexpr char const* DataHeader = "TC"; enum TCData { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h index bf996be6ef..0ba0005cc8 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h @@ -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 { diff --git a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h index af55d4a63e..384bd227b6 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h +++ b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h @@ -23,7 +23,7 @@ namespace DrakTharonKeep { #define DrakTharonKeepScriptName "instance_drak_tharon_keep" -#define DataHeader "DTK" +constexpr char const* DataHeader = "DTK"; uint32 const EncounterCount = 4; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h index 311780c1bd..51817ec3e6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h @@ -23,7 +23,7 @@ namespace ForgeOfSouls { #define FoSScriptName "instance_forge_of_souls" -#define DataHeader "FOS" +constexpr char const* DataHeader = "FOS"; uint32 const EncounterCount = 2; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index 027638ee25..d581c7eccb 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -25,7 +25,7 @@ namespace HallsOfReflection { #define HoRScriptName "instance_halls_of_reflection" -#define DataHeader "HOR" +constexpr char const* DataHeader = "HOR"; uint32 const EncounterCount = 3; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h index 9f9a0c0e8c..9e56ab17ed 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h @@ -24,7 +24,7 @@ namespace PitOfSaron { #define PoSScriptName "instance_pit_of_saron" -#define DataHeader "POS" +constexpr char const* DataHeader = "POS"; uint32 const EncounterCount = 3; diff --git a/src/server/scripts/Northrend/Gundrak/gundrak.h b/src/server/scripts/Northrend/Gundrak/gundrak.h index b62262f704..dbbd5e92e0 100644 --- a/src/server/scripts/Northrend/Gundrak/gundrak.h +++ b/src/server/scripts/Northrend/Gundrak/gundrak.h @@ -23,7 +23,7 @@ namespace Gundrak { #define GundrakScriptName "instance_gundrak" -#define DataHeader "GD" +constexpr char const* DataHeader = "GD"; uint32 const EncounterCount = 5; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 208dd35dc7..e26c7e13ba 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -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; diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h index e6257f9fe4..b378b2cd53 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h @@ -23,7 +23,7 @@ namespace Naxxramas { #define NaxxramasScriptName "instance_naxxramas" -#define DataHeader "NAX" +constexpr char const* DataHeader = "NAX"; uint32 const EncounterCount = 15; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h index 566ab53423..e9a59917f3 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h @@ -23,7 +23,7 @@ namespace EyeOfEternity { #define EoEScriptName "instance_eye_of_eternity" -#define DataHeader "EOE" +constexpr char const* DataHeader = "EOE"; enum EOEInstanceData { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h index ab8fa66ecb..570d08896e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h +++ b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h @@ -23,7 +23,7 @@ namespace Nexus { #define NexusScriptName "instance_nexus" -#define DataHeader "NEX" +constexpr char const* DataHeader = "NEX"; uint32 const EncounterCount = 5; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h index 00b54038e2..6c397c55b3 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h @@ -23,7 +23,7 @@ namespace Oculus { #define OculusScriptName "instance_oculus" -#define DataHeader "OC" +constexpr char const* DataHeader = "OC"; uint32 const EncounterCount = 4; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h index e9fbfe3bda..d7825fa827 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h @@ -23,7 +23,7 @@ namespace HallsOfLightning { #define HoLScriptName "instance_halls_of_lightning" -#define DataHeader "HOL" +constexpr char const* DataHeader = "HOL"; uint32 const EncounterCount = 4; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h index 3643ad28ac..ba527d345d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h @@ -23,7 +23,7 @@ namespace HallsOfStone { #define HoSScriptName "instance_halls_of_stone" -#define DataHeader "HOS" +constexpr char const* DataHeader = "HOS"; uint32 const EncounterCount = 4; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index e60c9d77d9..261bc46f2c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -23,7 +23,7 @@ namespace Ulduar { #define UlduarScriptName "instance_ulduar" -#define DataHeader "UU" +constexpr char const* DataHeader = "UU"; namespace YoggSaron { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h index f2eb1ff7c1..34e88ca449 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h @@ -23,7 +23,7 @@ namespace UtgardeKeep { #define UKScriptName "instance_utgarde_keep" -#define DataHeader "UK" +constexpr char const* DataHeader = "UK"; uint32 const EncounterCount = 3; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h index 84159fcb20..79531def1f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h @@ -23,7 +23,7 @@ namespace UtgardePinnacle { #define UPScriptName "instance_utgarde_pinnacle" -#define DataHeader "UP" +constexpr char const* DataHeader = "UP"; uint32 const EncounterCount = 4; diff --git a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h index e755fcb779..7767553ea2 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h +++ b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h @@ -23,7 +23,7 @@ namespace VaultOfArchavon { #define VoAScriptName "instance_vault_of_archavon" -#define DataHeader "VA" +constexpr char const* DataHeader = "VA"; uint32 const EncounterCount = 4; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h index e271fbad67..51c520cf68 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.h +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h @@ -23,7 +23,7 @@ namespace VioletHold { #define VioletHoldScriptName "instance_violet_hold" -#define DataHeader "VH" +constexpr char const* DataHeader = "VH"; uint32 const EncounterCount = 3 + 6; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h index 50242d1bb9..481b65e537 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h @@ -23,7 +23,7 @@ namespace AuchenaiCrypts { #define ACScriptName "instance_auchenai_crypts" -#define DataHeader "AC" +constexpr char const* DataHeader = "AC"; uint32 const EncounterCount = 2; diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h b/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h index 42c7bee202..b97fff5645 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h @@ -23,7 +23,7 @@ namespace ManaTombs { #define MTScriptName "instance_mana_tombs" -#define DataHeader "MT" +constexpr char const* DataHeader = "MT"; uint32 const EncounterCount = 4; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h index 48b06ba2c0..010d22f52f 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h @@ -23,7 +23,7 @@ namespace SethekkHalls { #define SHScriptName "instance_sethekk_halls" -#define DataHeader "SH" +constexpr char const* DataHeader = "SH"; uint32 const EncounterCount = 3; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h index 95823b787f..a5d89982de 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h @@ -24,7 +24,7 @@ namespace ShadowLabyrinth { #define SLScriptName "instance_shadow_labyrinth" -#define DataHeader "SL" +constexpr char const* DataHeader = "SL"; uint32 const EncounterCount = 4; diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h index 58d2032b31..dca677924a 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.h +++ b/src/server/scripts/Outland/BlackTemple/black_temple.h @@ -23,7 +23,7 @@ namespace BlackTemple { #define BTScriptName "instance_black_temple" -#define DataHeader "BT" +constexpr char const* DataHeader = "BT"; uint32 const EncounterCount = 9; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h index e1f0d7f0e5..ce080bfc7c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h @@ -23,7 +23,7 @@ namespace SerpentShrine { #define SSCScriptName "instance_serpent_shrine" -#define DataHeader "SS" +constexpr char const* DataHeader = "SS"; enum SSWaterEventState { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h index ebdb71150d..90adeb715e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h @@ -23,7 +23,7 @@ namespace SteamVault { #define SteamVaultScriptName "instance_steam_vault" -#define DataHeader "SV" +constexpr char const* DataHeader = "SV"; uint32 const EncounterCount = 3; diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h index fb0b88faa9..c636ec5098 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h @@ -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 { diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h index 6c5cb4ebfb..6a1ed2d262 100644 --- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h +++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h @@ -23,7 +23,7 @@ namespace GruulsLair { #define GLScriptName "instance_gruuls_lair" -#define DataHeader "GL" +constexpr char const* DataHeader = "GL"; uint32 const EncounterCount = 2; diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h index bcae0653f1..dfe739bb2f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h @@ -23,7 +23,7 @@ namespace BloodFurnace { #define BFScriptName "instance_blood_furnace" -#define DataHeader "BF" +constexpr char const* DataHeader = "BF"; uint32 const EncounterCount = 3; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h index 3a3540106a..d8438117b9 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h @@ -23,7 +23,7 @@ namespace HellfireRamparts { #define HRScriptName "instance_ramparts" -#define DataHeader "HR" +constexpr char const* DataHeader = "HR"; uint32 const EncounterCount = 4; diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h index 64e3bfc55f..2e6eee80ef 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h @@ -23,7 +23,7 @@ namespace MagtheridonsLair { #define MLScriptName "instance_magtheridons_lair" -#define DataHeader "ML" +constexpr char const* DataHeader = "ML"; uint32 const EncounterCount = 1; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h index 2a55443497..5cdc350589 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h @@ -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; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h index 19e8642cb4..81f78af6c4 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h @@ -23,7 +23,7 @@ namespace Eye { #define TheEyeScriptName "instance_the_eye" -#define DataHeader "TE" +constexpr char const* DataHeader = "TE"; uint32 const EncounterCount = 4; diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h index 928a708710..2f47082932 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h @@ -23,7 +23,7 @@ namespace Mechanar { #define MechanarScriptName "instance_mechanar" -#define DataHeader "MR" +constexpr char const* DataHeader = "MR"; uint32 const EncounterCount = 5; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h index 810d11a37a..a9d8f447bd 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h @@ -24,7 +24,7 @@ namespace Arcatraz { #define ArcatrazScriptName "instance_arcatraz" -#define DataHeader "AZ" +constexpr char const* DataHeader = "AZ"; uint32 const EncounterCount = 4; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h index 11576c4a00..59a9c15357 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h +++ b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h @@ -23,7 +23,7 @@ namespace Botanica { #define BotanicaScriptName "instance_the_botanica" -#define DataHeader "BC" +constexpr char const* DataHeader = "BC"; uint32 const EncounterCount = 5;