From b259614778c2939707baf865863bbbedd9fa0125 Mon Sep 17 00:00:00 2001
From: tkrokli <tkrokli@users.noreply.github.com>
Date: Wed, 29 Mar 2017 10:06:06 +0200
Subject: Scripts: minimize duplicated enum names in header files (#19377)

* Scripts: Minimize duplicated enum names in header files

This reduces the number of cache resets with the Zapcc compiler

- Standard followed is instance/raid TLA + DataTypes/CreaturesIds/etc
- Partial cherry-pick of master commit 7eb4512eee5fc04994e2aa55126ccc97a8393506
- Removed unused defines in sunken_temple.h (the core scripts using these have been moved to SAI)

(cherry picked from commit f6f36be004c3b8c7d09e0f320d5aabb8a9129109)
---
 .../MagtheridonsLair/instance_magtheridons_lair.cpp               | 4 ++--
 .../Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/server/scripts/Outland')

diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
index 515039e987b..8cd4bbc9cf0 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -55,7 +55,7 @@ ObjectData const gameObjectData[] =
     { 0,                            0                           } //END
 };
 
-static DataTypes const collapseObjectDatas[] =
+static MLDataTypes const collapseObjectDatas[] =
 {
     DATA_MAGTHERIDON_COLUMN_0,
     DATA_MAGTHERIDON_COLUMN_1,
@@ -116,7 +116,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                             HandleGameObject(ObjectGuid::Empty, value == ACTION_ENABLE ? true : false, hall);
                         break;
                     case DATA_COLLAPSE_2:
-                        for (DataTypes data : collapseObjectDatas)
+                        for (MLDataTypes data : collapseObjectDatas)
                             if (GameObject* go = GetGameObject(data))
                                 HandleGameObject(ObjectGuid::Empty, value == ACTION_ENABLE ? true : false, go);
                         break;
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
index 4e46ecd98e7..87190d446b0 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
@@ -25,7 +25,7 @@
 
 uint32 const EncounterCount = 1;
 
-enum DataTypes
+enum MLDataTypes
 {
     DATA_MAGTHERIDON          = 0,
     DATA_WORLD_TRIGGER        = 1,
@@ -42,13 +42,13 @@ enum DataTypes
     DATA_CALL_WARDERS         = 12
 };
 
-enum Actions
+enum MLActions
 {
     ACTION_ENABLE             = 1,
     ACTION_DISABLE            = 2
 };
 
-enum CreatureIds
+enum MLCreatureIds
 {
     NPC_MAGTHERIDON          = 17257,
     NPC_ABYSSAL              = 17454,
@@ -61,7 +61,7 @@ enum CreatureIds
     NPC_HELLFIRE_WARDER      = 18829
 };
 
-enum GameObjectIds
+enum MLGameObjectIds
 {
     GO_MAGTHERIDON_DOOR      = 183847,
     GO_MANTICRON_CUBE        = 181713,
-- 
cgit v1.2.3