Core/Groups: Reduce differences between branches (define naming) (#29332)

9 files changed, 29 insertions, 29 deletions

diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
index aed2154129f..f8c7b97cb47 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
@@ -60,7 +60,7 @@ class boss_darkmaster_gandling : public CreatureScript
 
         struct boss_darkmaster_gandlingAI : public BossAI
         {
-            boss_darkmaster_gandlingAI(Creature* creature) : BossAI(creature, DATA_DARKMASTERGANDLING) { }
+            boss_darkmaster_gandlingAI(Creature* creature) : BossAI(creature, DATA_DARKMASTER_GANDLING) { }
 
             void Reset() override
             {
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
index f058d2ac3d6..56c78aa4162 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
@@ -51,7 +51,7 @@ class boss_doctor_theolen_krastinov : public CreatureScript
 
         struct boss_theolenkrastinovAI : public BossAI
         {
-            boss_theolenkrastinovAI(Creature* creature) : BossAI(creature, DATA_DOCTORTHEOLENKRASTINOV) { }
+            boss_theolenkrastinovAI(Creature* creature) : BossAI(creature, DATA_DOCTOR_THEOLEN_KRASTINOV) { }
 
             void JustEngagedWith(Unit* who) override
             {
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
index 1efb043fd00..28e7529fa54 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
@@ -49,7 +49,7 @@ class boss_illucia_barov : public CreatureScript
 
         struct boss_illuciabarovAI : public BossAI
         {
-            boss_illuciabarovAI(Creature* creature) : BossAI(creature, DATA_LADYILLUCIABAROV) { }
+            boss_illuciabarovAI(Creature* creature) : BossAI(creature, DATA_LADY_ILLUCIA_BAROV) { }
 
             void JustEngagedWith(Unit* who) override
             {
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
index eef824e3d03..9a8002b070f 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
@@ -50,7 +50,7 @@ class boss_instructor_malicia : public CreatureScript
 
         struct boss_instructormaliciaAI : public BossAI
         {
-            boss_instructormaliciaAI(Creature* creature) : BossAI(creature, DATA_INSTRUCTORMALICIA)
+            boss_instructormaliciaAI(Creature* creature) : BossAI(creature, DATA_INSTRUCTOR_MALICIA)
             {
                 Initialize();
             }
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
index 20be79069ed..22ed088934c 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
@@ -45,7 +45,7 @@ class boss_lord_alexei_barov : public CreatureScript
 
         struct boss_lordalexeibarovAI : public BossAI
         {
-            boss_lordalexeibarovAI(Creature* creature) : BossAI(creature, DATA_LORDALEXEIBAROV) { }
+            boss_lordalexeibarovAI(Creature* creature) : BossAI(creature, DATA_LORD_ALEXEI_BAROV) { }
 
             void Reset() override
             {
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
index 8ae50697d9b..07615837321 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
@@ -48,7 +48,7 @@ class boss_lorekeeper_polkelt : public CreatureScript
 
         struct boss_lorekeeperpolkeltAI : public BossAI
         {
-            boss_lorekeeperpolkeltAI(Creature* creature) : BossAI(creature, DATA_LOREKEEPERPOLKELT) { }
+            boss_lorekeeperpolkeltAI(Creature* creature) : BossAI(creature, DATA_LOREKEEPER_POLKELT) { }
 
             void JustEngagedWith(Unit* who) override
             {
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
index 63050b56ab5..3b6965f7582 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
@@ -48,7 +48,7 @@ class boss_the_ravenian : public CreatureScript
 
         struct boss_theravenianAI : public BossAI
         {
-            boss_theravenianAI(Creature* creature) : BossAI(creature, DATA_THERAVENIAN) { }
+            boss_theravenianAI(Creature* creature) : BossAI(creature, DATA_THE_RAVENIAN) { }
 
             void JustEngagedWith(Unit* who) override
             {
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
index 4bbba1d1a85..504cdaf3ca1 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
@@ -85,12 +85,12 @@ class instance_scholomance : public InstanceMapScript
 
                 switch (type)
                 {
-                    case DATA_LORDALEXEIBAROV:
-                    case DATA_DOCTORTHEOLENKRASTINOV:
-                    case DATA_THERAVENIAN:
-                    case DATA_LOREKEEPERPOLKELT:
-                    case DATA_INSTRUCTORMALICIA:
-                    case DATA_LADYILLUCIABAROV:
+                    case DATA_LORD_ALEXEI_BAROV:
+                    case DATA_DOCTOR_THEOLEN_KRASTINOV:
+                    case DATA_THE_RAVENIAN:
+                    case DATA_LOREKEEPER_POLKELT:
+                    case DATA_INSTRUCTOR_MALICIA:
+                    case DATA_LADY_ILLUCIA_BAROV:
                         CheckToSpawnGandling();
                         break;
                     default:
@@ -133,20 +133,20 @@ class instance_scholomance : public InstanceMapScript
             {
                 switch (bossId)
                 {
-                    case DATA_DARKMASTERGANDLING:
-                        if (GetBossState(DATA_LORDALEXEIBAROV) != DONE)
+                    case DATA_DARKMASTER_GANDLING:
+                        if (GetBossState(DATA_LORD_ALEXEI_BAROV) != DONE)
                             return false;
-                        if (GetBossState(DATA_DOCTORTHEOLENKRASTINOV) != DONE)
+                        if (GetBossState(DATA_DOCTOR_THEOLEN_KRASTINOV) != DONE)
                             return false;
-                        if (GetBossState(DATA_THERAVENIAN) != DONE)
+                        if (GetBossState(DATA_THE_RAVENIAN) != DONE)
                             return false;
-                        if (GetBossState(DATA_LOREKEEPERPOLKELT) != DONE)
+                        if (GetBossState(DATA_LOREKEEPER_POLKELT) != DONE)
                             return false;
-                        if (GetBossState(DATA_INSTRUCTORMALICIA) != DONE)
+                        if (GetBossState(DATA_INSTRUCTOR_MALICIA) != DONE)
                             return false;
-                        if (GetBossState(DATA_LADYILLUCIABAROV) != DONE)
+                        if (GetBossState(DATA_LADY_ILLUCIA_BAROV) != DONE)
                             return false;
-                        if (GetBossState(DATA_DARKMASTERGANDLING) == DONE)
+                        if (GetBossState(DATA_DARKMASTER_GANDLING) == DONE)
                             return false;
                         break;
                     default:
@@ -158,7 +158,7 @@ class instance_scholomance : public InstanceMapScript
 
             void CheckToSpawnGandling()
             {
-                if (CheckPreBosses(DATA_DARKMASTERGANDLING))
+                if (CheckPreBosses(DATA_DARKMASTER_GANDLING))
                     instance->SummonCreature(NPC_DARKMASTER_GANDLING, GandlingLoc);
             }
 
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
index 651f1c26625..42b075eb4b5 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
+++ b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
@@ -27,13 +27,13 @@ uint32 const EncounterCount             = 8;
 
 enum SCDataTypes
 {
-    DATA_DOCTORTHEOLENKRASTINOV         = 0,
-    DATA_INSTRUCTORMALICIA              = 1,
-    DATA_LADYILLUCIABAROV               = 2,
-    DATA_LORDALEXEIBAROV                = 3,
-    DATA_LOREKEEPERPOLKELT              = 4,
-    DATA_THERAVENIAN                    = 5,
-    DATA_DARKMASTERGANDLING             = 6,
+    DATA_DOCTOR_THEOLEN_KRASTINOV       = 0,
+    DATA_INSTRUCTOR_MALICIA             = 1,
+    DATA_LADY_ILLUCIA_BAROV             = 2,
+    DATA_LORD_ALEXEI_BAROV              = 3,
+    DATA_LOREKEEPER_POLKELT             = 4,
+    DATA_THE_RAVENIAN                   = 5,
+    DATA_DARKMASTER_GANDLING            = 6,
     DATA_KIRTONOS                       = 7
 };