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)
---
 .../scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h  | 12 ++++++------
 src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h          |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

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

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 b066eb59bea..4c3faf67b5a 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 @@
 #define EoEScriptName "instance_eye_of_eternity"
 #define DataHeader "EOE"
 
-enum InstanceData
+enum EOEInstanceData
 {
     DATA_MALYGOS_EVENT,
     MAX_ENCOUNTER,
@@ -33,7 +33,7 @@ enum InstanceData
     DATA_RESPAWN_IRIS
 };
 
-enum InstanceData64
+enum EOEInstanceData64
 {
     DATA_TRIGGER,
     DATA_MALYGOS,
@@ -44,7 +44,7 @@ enum InstanceData64
     DATA_GIFT_BOX_BUNNY_GUID
 };
 
-enum InstanceNpcs
+enum EOEInstanceNpcs
 {
     NPC_MALYGOS             = 28859,
     NPC_VORTEX_TRIGGER      = 30090,
@@ -60,7 +60,7 @@ enum InstanceNpcs
     NPC_SURGE_OF_POWER      = 30334
 };
 
-enum InstanceGameObjects
+enum EOEInstanceGameObjects
 {
     GO_NEXUS_RAID_PLATFORM      = 193070,
     GO_EXIT_PORTAL              = 193908,
@@ -72,12 +72,12 @@ enum InstanceGameObjects
     GO_HEART_OF_MAGIC_25        = 194159
 };
 
-enum InstanceEvents
+enum EOEInstanceEvents
 {
     EVENT_FOCUSING_IRIS = 20711
 };
 
-enum InstanceSpells
+enum EOEInstanceSpells
 {
     SPELL_VORTEX_4                        = 55853, // damage | used to enter to the vehicle
     SPELL_VORTEX_5                        = 56263, // damage | used to enter to the vehicle
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
index 74adb6d1d13..a26b699b396 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
@@ -279,7 +279,7 @@ enum UlduarGameObjects
     GO_GIFT_OF_THE_OBSERVER_25              = 194822,
 };
 
-enum EventIds
+enum UUEventIds
 {
     EVENT_TOWER_OF_STORM_DESTROYED      = 21031,
     EVENT_TOWER_OF_FROST_DESTROYED      = 21032,
-- 
cgit v1.2.3