aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Kalimdor
diff options
context:
space:
mode:
authorDuarte Duarte <dnpd.dd@gmail.com>2016-12-01 01:51:07 +0000
committerGitHub <noreply@github.com>2016-12-01 01:51:07 +0000
commit7eb4512eee5fc04994e2aa55126ccc97a8393506 (patch)
tree7adf78e39761658ce34224dca58b0b09b84dfdd5 /src/server/scripts/Kalimdor
parentc6bc131b36dea28e3a134fdb08052f4b48891792 (diff)
Scripts: Minimize duplicated enum names in header files (#18346)
This reduces the number of cache resets with the Zapcc compiler Standard followed is instance/raid TLA + DataTypes/CreaturesIds/etc
Diffstat (limited to 'src/server/scripts/Kalimdor')
-rw-r--r--src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h8
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h8
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h14
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h4
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h8
-rw-r--r--src/server/scripts/Kalimdor/Firelands/firelands.h4
-rw-r--r--src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h10
-rw-r--r--src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h14
-rw-r--r--src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h6
-rw-r--r--src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h6
-rw-r--r--src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h6
-rw-r--r--src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h2
-rw-r--r--src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h6
13 files changed, 48 insertions, 48 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
index ac20a305f14..e746b917bc4 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
@@ -23,7 +23,7 @@
uint32 const EncounterCount = 3;
-enum Data64
+enum BFDData64
{
DATA_SHRINE1,
DATA_SHRINE2,
@@ -35,7 +35,7 @@ enum Data64
DATA_MAINDOOR,
};
-enum Data
+enum BFDData
{
DATA_GELIHAST,
DATA_KELRIS,
@@ -44,7 +44,7 @@ enum Data
DATA_EVENT
};
-enum CreatureIds
+enum BFDCreatureIds
{
NPC_TWILIGHT_LORD_KELRIS = 4832,
NPC_LORGUS_JETT = 12902,
@@ -57,7 +57,7 @@ enum CreatureIds
NPC_MORRIDUNE = 6729
};
-enum GameObjectIds
+enum BFDGameObjectIds
{
GO_SHRINE_OF_GELIHAST = 103015,
GO_FIRE_OF_AKU_MAI_1 = 21118,
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
index 95ec1341d02..ada5218c326 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
@@ -23,7 +23,7 @@
uint32 const EncounterCount = 5;
-enum DataTypes
+enum HYDataTypes
{
DATA_ANETHERON = 1,
DATA_ANETHERONEVENT = 2,
@@ -48,14 +48,14 @@ enum DataTypes
DATA_CHANNEL_TARGET = 21
};
-enum WorldStateIds
+enum HYWorldStateIds
{
WORLD_STATE_WAVES = 2842,
WORLD_STATE_ENEMY = 2453,
WORLD_STATE_ENEMYCOUNT = 2454
};
-enum CreaturesIds
+enum HYCreaturesIds
{
// Trash Mobs summoned in waves
NECROMANCER = 17899,
@@ -82,7 +82,7 @@ enum CreaturesIds
NPC_CHANNEL_TARGET = 22418
};
-enum GameobjectIds
+enum HYGameobjectIds
{
GO_HORDE_ENCAMPMENT_PORTAL = 182060,
GO_NIGHT_ELF_VILLAGE_PORTAL = 182061,
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 1e10dec1ff5..f56f7bd0b77 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
@@ -22,7 +22,7 @@
#define CoSScriptName "instance_culling_of_stratholme"
uint32 const EncounterCount = 5;
-enum DataTypes
+enum CSDataTypes
{
DATA_ARTHAS,
DATA_MEATHOOK,
@@ -39,7 +39,7 @@ enum DataTypes
DATA_INFINITE_COUNTER
};
-enum CreatureIds
+enum CSCreatureIds
{
NPC_MEATHOOK = 26529,
NPC_SALRAMM = 26530,
@@ -58,7 +58,7 @@ enum CreatureIds
NPC_GUARDIAN_OF_TIME = 32281
};
-enum GameObjectIds
+enum CSGameObjectIds
{
GO_SHKAF_GATE = 188686,
GO_MALGANIS_GATE_1 = 187711,
@@ -70,7 +70,7 @@ enum GameObjectIds
GO_PLAGUED_CRATE = 190095
};
-enum WorldStatesCoT
+enum CSWorldStatesCoT
{
WORLDSTATE_SHOW_CRATES = 3479,
WORLDSTATE_CRATES_REVEALED = 3480,
@@ -79,12 +79,12 @@ enum WorldStatesCoT
WORLDSTATE_TIME_GUARDIAN_SHOW = 3932
};
-enum CrateSpells
+enum CSCrateSpells
{
SPELL_CRATES_CREDIT = 58109
};
-enum Texts
+enum CSTexts
{
SAY_CRATES_COMPLETED = 0,
// Chromie
@@ -95,7 +95,7 @@ enum Texts
SAY_FAIL_EVENT = 2 // On Infinite Corruptor event fail
};
-enum InstanceEvents
+enum CSInstanceEvents
{
EVENT_INFINITE_TIMER = 1
};
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
index f35e223045a..f4cd0e121ee 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
@@ -21,7 +21,7 @@
#define DataHeader "OH"
-enum DataTypes
+enum OHDataTypes
{
TYPE_BARREL_DIVERSION = 1,
TYPE_THRALL_EVENT = 2,
@@ -36,7 +36,7 @@ enum DataTypes
};
-enum WorldStateIds
+enum OHWorldStateIds
{
WORLD_STATE_OH = 2436
};
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 cd648e34417..c81b224e94d 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 @@
uint32 const EncounterCount = 2;
-enum DataTypes
+enum TBMDataTypes
{
TYPE_MEDIVH = 1,
TYPE_RIFT = 2,
@@ -35,20 +35,20 @@ enum DataTypes
DATA_SHIELD = 12
};
-enum WorldStateIds
+enum TBMWorldStateIds
{
WORLD_STATE_BM = 2541,
WORLD_STATE_BM_SHIELD = 2540,
WORLD_STATE_BM_RIFT = 2784
};
-enum QuestIds
+enum TBMQuestIds
{
QUEST_OPENING_PORTAL = 10297,
QUEST_MASTER_TOUCH = 9836
};
-enum CreatureIds
+enum TBMCreatureIds
{
NPC_MEDIVH = 15608,
NPC_TIME_RIFT = 17838,
diff --git a/src/server/scripts/Kalimdor/Firelands/firelands.h b/src/server/scripts/Kalimdor/Firelands/firelands.h
index 333233af126..8f18f9cf10b 100644
--- a/src/server/scripts/Kalimdor/Firelands/firelands.h
+++ b/src/server/scripts/Kalimdor/Firelands/firelands.h
@@ -26,7 +26,7 @@
uint32 const EncounterCount = 7;
-enum DataTypes
+enum FLDataTypes
{
DATA_BETH_TILAC = 0,
DATA_LORD_RHYOLITH = 1,
@@ -37,7 +37,7 @@ enum DataTypes
DATA_RAGNAROS = 6,
};
-enum CreatureIds
+enum FLCreatureIds
{
NPC_BLAZING_MONSTROSITY_LEFT = 53786,
NPC_BLAZING_MONSTROSITY_RIGHT = 53791,
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
index 345b3ac9da9..ca5e6a7e3f6 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 @@
uint32 const EncounterCount = 12;
-enum Data
+enum HOOData
{
// Bosses
DATA_TEMPLE_GUARDIAN_ANHUUR,
@@ -52,7 +52,7 @@ enum Data
DATA_ANRAPHET_GUID,
};
-enum Creatures
+enum HOOCreatures
{
BOSS_TEMPLE_GUARDIAN_ANHUUR = 39425,
NPC_CAVE_IN_STALKER = 40183,
@@ -76,7 +76,7 @@ enum Creatures
NPC_OMEGA_STANCE = 41194,
};
-enum GameObjects
+enum HOOGameObjects
{
GO_ANHUURS_BRIDGE = 206506,
GO_DOODAD_ULDUM_ELEVATOR_COL01 = 207725,
@@ -99,14 +99,14 @@ enum GameObjects
GO_DOODAD_ULDUM_LASERBEAMS_03 = 207665, // Matches GO_DOODAD_ULDUM_LIGHTMACHINE_03
};
-enum Misc
+enum HOOMisc
{
AREA_TOMB_OF_THE_EARTHRAGER = 4945,
ACHIEV_VAULT_OF_LIGHTS_EVENT = 24212, // Faster Than The Speed Of Light
SPELL_VAULT_OF_LIGHTS_CREDIT = 94067, // Not in DBC
};
-enum GlobalActions
+enum HOOGlobalActions
{
ACTION_ANRAPHET_INTRO,
ACTION_ELEMENTAL_DIED,
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
index a2ee396a156..a750967cd48 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
@@ -22,32 +22,32 @@
uint32 const EncounterCount = 1;
-enum DataTypes
+enum OLDataTypes
{
DATA_ONYXIA = 0,
};
-enum Data32
+enum OLData32
{
DATA_ONYXIA_PHASE = 0,
DATA_SHE_DEEP_BREATH_MORE = 1,
DATA_MANY_WHELPS_COUNT = 2
};
-enum Data64
+enum OLData64
{
DATA_ONYXIA_GUID = 0,
DATA_FLOOR_ERUPTION_GUID = 1
};
-enum OnyxiaPhases
+enum OLOnyxiaPhases
{
PHASE_START = 1,
PHASE_BREATH = 2,
PHASE_END = 3
};
-enum CreatureIds
+enum OLCreatureIds
{
NPC_WHELP = 11262,
NPC_LAIRGUARD = 36561,
@@ -55,13 +55,13 @@ enum CreatureIds
NPC_TRIGGER = 14495
};
-enum GameObjectIds
+enum OLGameObjectIds
{
GO_WHELP_SPAWNER = 176510,
GO_WHELP_EGG = 176511
};
-enum AchievementData
+enum OLAchievementData
{
ACHIEV_CRITERIA_MANY_WHELPS_10_PLAYER = 12565, // Criteria for achievement 4403: Many Whelps! Handle It! (10 player) Hatch 50 eggs in 10s
ACHIEV_CRITERIA_MANY_WHELPS_25_PLAYER = 12568, // Criteria for achievement 4406: Many Whelps! Handle It! (25 player) Hatch 50 eggs in 10s
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
index 6108d135694..763e3d0cbee 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
@@ -23,7 +23,7 @@
uint32 const EncounterCount = 5;
-enum DataTypes
+enum RFDDataTypes
{
// Main Bosses
DATA_TUTEN_KASH = 0,
@@ -36,7 +36,7 @@ enum DataTypes
DATA_EXTINGUISHING_THE_IDOL = 6
};
-enum CreatureIds
+enum RFDCreatureIds
{
// Used in Tuten Kash summon event
NPC_TOMB_FIEND = 7349,
@@ -50,7 +50,7 @@ enum CreatureIds
NPC_PLAGUEMAW_THE_ROTTING = 7356
};
-enum GameObjectIds
+enum RFDGameObjectIds
{
// Used for Tuten Kash summon event
GO_GONG = 148917,
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
index 3455c6eaae6..d5cc496537b 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
@@ -20,7 +20,7 @@
#define DataHeader "AQR"
-enum DataTypes
+enum AQRDataTypes
{
DATA_KURINNAXX = 0,
DATA_RAJAXX = 1,
@@ -33,7 +33,7 @@ enum DataTypes
DATA_PARALYZED = 7
};
-enum Creatures
+enum AQRCreatures
{
NPC_KURINAXX = 15348,
NPC_RAJAXX = 15341,
@@ -52,7 +52,7 @@ enum Creatures
NPC_HORNET = 15934
};
-enum GameObjects
+enum AQRGameObjectIds
{
GO_OSSIRIAN_CRYSTAL = 180619
};
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
index fa1de26ecae..61084cd11c3 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
@@ -21,7 +21,7 @@
#define DataHeader "AQT"
-enum DataTypes
+enum AQTDataTypes
{
DATA_SKERAM = 1,
DATA_KRI = 2,
@@ -39,7 +39,7 @@ enum DataTypes
DATA_VISCIDUS = 21
};
-enum Creatures
+enum AQTCreatures
{
BOSS_EYE_OF_CTHUN = 15589,
NPC_CTHUN_PORTAL = 15896,
@@ -61,5 +61,5 @@ enum Creatures
NPC_VEKLOR = 15276,
NPC_VEKNILASH = 15275
};
-#endif
+#endif
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
index 7f77e12eeaf..1da7fe79577 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
+++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
@@ -21,7 +21,7 @@
#define DataHeader "WC"
-enum DataTypes
+enum WCDataTypes
{
TYPE_LORD_COBRAHN = 1,
TYPE_LORD_PYTHAS = 2,
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
index cd9f935045f..7ffb447af06 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
@@ -21,7 +21,7 @@
#define DataHeader "ZF"
-enum zfEntries
+enum ZFEntries
{
ENTRY_ZUM_RAH = 7271,
ENTRY_BLY = 7604,
@@ -36,12 +36,12 @@ enum zfEntries
EVENT_GAHZRILLA
};
-enum DataTypes
+enum ZFDataTypes
{
DATA_ZUM_RAH = 0
};
-enum zfPyramidPhases
+enum ZFPyramidPhases
{
PYRAMID_NOT_STARTED, //default
PYRAMID_CAGES_OPEN, //happens in GO hello for cages