diff options
| author | tkrokli <tkrokli@users.noreply.github.com> | 2017-03-29 10:06:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-29 10:06:06 +0200 |
| commit | f6f36be004c3b8c7d09e0f320d5aabb8a9129109 (patch) | |
| tree | 1dc5d19a9c4aa4a9404235e07ed6323c36d8443b /src/server/scripts/Northrend | |
| parent | 83162fafa453c1d34fe23ddd86a43c3dff058300 (diff) | |
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)
Diffstat (limited to 'src/server/scripts/Northrend')
27 files changed, 124 insertions, 124 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h index d1bde86c1a5..970a64e1fd8 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h @@ -23,7 +23,7 @@ uint32 const EncounterCount = 5; -enum DataTypes +enum AKDataTypes { // Encounter States/Boss GUIDs DATA_ELDER_NADOX = 0, @@ -44,7 +44,7 @@ enum DataTypes DATA_ALL_INITIAND_DEAD = 13 }; -enum CreatureIds +enum AKCreatureIds { NPC_ELDER_NADOX = 29309, NPC_PRINCE_TALDARAM = 29308, @@ -72,7 +72,7 @@ enum CreatureIds NPC_TWISTED_VISAGE = 30625 }; -enum GameObjectIds +enum AKGameObjectIds { GO_PRINCE_TALDARAM_GATE = 192236, GO_PRINCE_TALDARAM_PLATFORM = 193564, diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h index d5c9eda2be1..bbd55c7944d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h @@ -22,7 +22,7 @@ uint32 const EncounterCount = 3; -enum DataTypes +enum ANDataTypes { // Encounter States/Boss GUIDs DATA_KRIKTHIR = 0, @@ -37,7 +37,7 @@ enum DataTypes DATA_ANUBARAK_WALL_2 }; -enum CreatureIds +enum ANCreatureIds { NPC_KRIKTHIR = 28684, NPC_HADRONOX = 28921, @@ -54,7 +54,7 @@ enum InstanceActions ACTION_GATEWATCHER_GREET = 1 }; -enum GameObjectIds +enum ANGameObjectIds { GO_KRIKTHIR_DOOR = 192395, GO_ANUBARAK_DOOR_1 = 192396, diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 1c5d833d814..b3bc2133dab 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -1048,7 +1048,7 @@ class achievement_watch_him_die : public AchievementCriteriaScript if (!instance) return false; - for (DataTypes watcherData : {DATA_WATCHER_GASHRA, DATA_WATCHER_NARJIL, DATA_WATCHER_SILTHIK}) + for (ANDataTypes watcherData : {DATA_WATCHER_GASHRA, DATA_WATCHER_NARJIL, DATA_WATCHER_SILTHIK}) { if (Creature* watcher = instance->GetCreature(watcherData)) if (watcher->IsAlive()) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h index c6f74fca5de..92331e8c8bf 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h @@ -23,7 +23,7 @@ uint32 const EncounterCount = 5; -enum DataTypes +enum OSDataTypes { DATA_SARTHARION = 0, DATA_TENEBRON = 1, @@ -33,7 +33,7 @@ enum DataTypes TWILIGHT_ACHIEVEMENTS = 5 }; -enum CreaturesIds +enum OSCreaturesIds { NPC_SARTHARION = 28860, NPC_TENEBRON = 30452, @@ -41,7 +41,7 @@ enum CreaturesIds NPC_VESPERON = 30449 }; -enum GameObjectIds +enum OSGameObjectIds { GO_TWILIGHT_PORTAL = 193988 }; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h index c04f7d2ba3c..6411037ad70 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h @@ -25,7 +25,7 @@ uint32 const EncounterCount = 4; Position const HalionControllerSpawnPos = {3156.037f, 533.2656f, 72.97205f, 0.0f}; -enum DataTypes +enum RSDataTypes { // Encounter States/Boss GUIDs DATA_BALTHARUS_THE_WARBORN = 0, @@ -53,7 +53,7 @@ enum DataTypes DATA_FLAME_WALLS = 20 }; -enum SharedActions +enum RSSharedActions { ACTION_INTRO_BALTHARUS = -3975101, ACTION_BALTHARUS_DEATH = -3975102, @@ -61,7 +61,7 @@ enum SharedActions ACTION_INTRO_HALION_2 = -4014602 }; -enum CreaturesIds +enum RSCreaturesIds { // Baltharus the Warborn NPC_BALTHARUS_THE_WARBORN = 39751, @@ -102,7 +102,7 @@ enum CreaturesIds NPC_XERESTRASZA = 40429 }; -enum GameObjectsIds +enum RSGameObjectsIds { GO_HALION_PORTAL_1 = 202794, // Unknown spell 75074, should be somehow be linked to 74807 GO_HALION_PORTAL_2 = 202795, // Also spell 75074 @@ -117,14 +117,14 @@ enum GameObjectsIds GO_BURNING_TREE_4 = 203037 }; -enum WorldStatesRS +enum RSWorldStatesRS { WORLDSTATE_CORPOREALITY_MATERIAL = 5049, WORLDSTATE_CORPOREALITY_TWILIGHT = 5050, WORLDSTATE_CORPOREALITY_TOGGLE = 5051 }; -enum InstanceSpell +enum RSInstanceSpell { SPELL_BERSERK = 26662 }; 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 6883cd8a4b8..d4be2f90f6e 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 @@ -21,7 +21,7 @@ #define DataHeader "TC" -enum Data +enum TCData { BOSS_GRAND_CHAMPIONS, BOSS_ARGENT_CHALLENGE_E, @@ -34,7 +34,7 @@ enum Data DATA_ARGENT_SOLDIER_DEFEATED }; -enum Data64 +enum TCData64 { DATA_ANNOUNCER, DATA_MAIN_GATE, @@ -48,7 +48,7 @@ enum Data64 DATA_GRAND_CHAMPION_3 }; -enum CreatureIds +enum TCCreatureIds { // Horde Champions NPC_MOKRA = 35572, @@ -80,7 +80,7 @@ enum CreatureIds NPC_ARELAS = 35005 }; -enum GameObjects +enum TCGameObjects { GO_MAIN_GATE = 195647, @@ -94,7 +94,7 @@ enum GameObjects GO_PALETRESS_LOOT_H = 195324 }; -enum Vehicles +enum TCVehicles { //Grand Champions Alliance Vehicles VEHICLE_MARSHAL_JACOB_ALERIUS_MOUNT = 35637, 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 d53d6705400..5178961d651 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 @@ -7,7 +7,7 @@ #define DataHeader "TCR" -enum DataTypes +enum TCRDataTypes { BOSS_BEASTS = 0, BOSS_JARAXXUS = 1, @@ -31,7 +31,7 @@ enum DataTypes DECREASE = 502, }; -enum SpellIds +enum TCRSpellIds { SPELL_WILFRED_PORTAL = 68424, SPELL_JARAXXUS_CHAINS = 67924, @@ -39,7 +39,7 @@ enum SpellIds SPELL_DESTROY_FLOOR_KNOCKUP = 68193, }; -enum MiscData +enum TCRMiscData { DESPAWN_TIME = 1200000 }; @@ -145,7 +145,7 @@ const Position EndSpawnLoc[]= {644.6250f, 149.2743f, 140.6015f, 5.f} // 2 - Portal to Dalaran }; -enum WorldStateIds +enum TCRWorldStateIds { UPDATE_STATE_UI_SHOW = 4390, UPDATE_STATE_UI_COUNT = 4389 @@ -174,7 +174,7 @@ enum AnnouncerMessages MSG_ANUBARAK = 724006 }; -enum CreatureIds +enum TCRCreatureIds { NPC_BARRENT = 34816, NPC_TIRION = 34996, @@ -238,7 +238,7 @@ enum CreatureIds NPC_ANUBARAK = 34564 }; -enum GameObjectIds +enum TCRGameObjectIds { GO_CRUSADERS_CACHE_10 = 195631, GO_CRUSADERS_CACHE_25 = 195632, @@ -264,7 +264,7 @@ enum GameObjectIds GO_PORTAL_TO_DALARAN = 195682 }; -enum AchievementData +enum TCRAchievementData { // Northrend Beasts UPPER_BACK_PAIN_10_PLAYER = 11779, diff --git a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h index 5365b91c232..de016aed14e 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 @@ uint32 const EncounterCount = 4; -enum DataTypes +enum DTKDataTypes { // Encounter States/Boss GUIDs DATA_TROLLGORE = 0, @@ -50,7 +50,7 @@ enum DataTypes ACTION_CRYSTAL_HANDLER_DIED }; -enum CreatureIds +enum DTKCreatureIds { NPC_TROLLGORE = 26630, NPC_NOVOS = 26631, @@ -76,7 +76,7 @@ enum CreatureIds NPC_WORLD_TRIGGER = 22515 }; -enum GameObjectIds +enum DTKGameObjectIds { GO_NOVOS_CRYSTAL_1 = 189299, GO_NOVOS_CRYSTAL_2 = 189300, 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 93c0b55d53a..897cd72ba50 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 @@ uint32 const EncounterCount = 2; -enum Data +enum FOSData { // Encounter states and GUIDs DATA_BRONJAHM = 0, @@ -33,7 +33,7 @@ enum Data DATA_TEAM_IN_INSTANCE = 2 }; -enum Creatures +enum FOSCreatures { NPC_BRONJAHM = 36497, NPC_DEVOURER = 36502, 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 13455028164..77f7d9d41a7 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -29,7 +29,7 @@ uint32 const EncounterCount = 3; 2 - The Lich King */ -enum DataTypes +enum HORDataTypes { DATA_FALRIC = 0, DATA_MARWYN = 1, @@ -55,7 +55,7 @@ enum DataTypes DATA_QUEL_DELAR_INVOKER = 17 }; -enum CreatureIds +enum HORCreatureIds { NPC_JAINA_INTRO = 37221, NPC_SYLVANAS_INTRO = 37223, @@ -92,7 +92,7 @@ enum CreatureIds NPC_WORLD_TRIGGER = 22515 }; -enum GameObjectIds +enum HORGameObjectIds { GO_FROSTMOURNE = 202302, GO_ENTRANCE_DOOR = 201976, @@ -115,14 +115,14 @@ enum GameObjectIds GO_THE_CAPTAIN_CHEST_HORDE_HEROIC = 202337 }; -enum Achievements +enum HORAchievements { ACHIEV_NOT_RETREATING_EVENT = 22615, SPELL_ACHIEV_CHECK = 72830 }; // Common actions from Instance Script to Boss Script -enum Actions +enum HORActions { ACTION_ENTER_COMBAT = -668001, ACTION_START_PREFIGHT = -668002, @@ -131,7 +131,7 @@ enum Actions ACTION_GUNSHIP_ARRIVAL_2 = -668005 }; -enum InstanceEvents +enum HORInstanceEvents { EVENT_SPAWN_WAVES = 1, EVENT_NEXT_WAVE = 2, @@ -141,14 +141,14 @@ enum InstanceEvents EVENT_QUEL_DELAR_SUMMON_UTHER = 6 }; -enum InstanceEventIds +enum HORInstanceEventIds { EVENT_GUNSHIP_ARRIVAL = 22709, EVENT_GUNSHIP_ARRIVAL_2 = 22714, EVENT_ICE_WALL_SUMMONED = 22795 }; -enum InstanceSpells +enum HORInstanceSpells { // Trash SPELL_WELL_OF_SOULS = 72630, // cast when spawn (become visible) @@ -174,19 +174,19 @@ enum InstanceSpells SPELL_ESSENCE_OF_CAPTURED = 70720 }; -enum InstanceQuests +enum HORInstanceQuests { QUEST_HALLS_OF_REFLECTION_ALLIANCE = 24480, QUEST_HALLS_OF_REFLECTION_HORDE = 24561 }; -enum InstanceWorldStates +enum HORInstanceWorldStates { WORLD_STATE_HOR_WAVES_ENABLED = 4884, WORLD_STATE_HOR_WAVE_COUNT = 4882 }; -enum InstanceYells +enum HORInstanceYells { SAY_CAPTAIN_FIRE = 0, SAY_CAPTAIN_FINAL = 1 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 b63aff0222b..9f2a1abd3a6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h @@ -23,7 +23,7 @@ uint32 const EncounterCount = 3; -enum DataTypes +enum POSDataTypes { // Encounter states and GUIDs DATA_GARFROST = 0, @@ -41,7 +41,7 @@ enum DataTypes DATA_CAVERN_ACTIVE = 10 }; -enum CreatureIds +enum POSCreatureIds { NPC_GARFROST = 36494, NPC_KRICK = 36477, @@ -92,14 +92,14 @@ enum CreatureIds NPC_CAVERN_EVENT_TRIGGER = 32780 }; -enum GameObjectIds +enum POSGameObjectIds { GO_SARONITE_ROCK = 196485, GO_ICE_WALL = 201885, GO_HALLS_OF_REFLECTION_PORTCULLIS = 201848 }; -enum SpellsIcicle +enum POSSpellsIcicle { SPELL_ICICLE_SUMMON = 69424, SPELL_ICICLE_FALL_TRIGGER = 69426, diff --git a/src/server/scripts/Northrend/Gundrak/gundrak.h b/src/server/scripts/Northrend/Gundrak/gundrak.h index fea76e233c2..68de4c716c9 100644 --- a/src/server/scripts/Northrend/Gundrak/gundrak.h +++ b/src/server/scripts/Northrend/Gundrak/gundrak.h @@ -23,7 +23,7 @@ uint32 const EncounterCount = 5; -enum DataTypes +enum GDDataTypes { // Encounter Ids // Encounter States // Boss GUIDs DATA_SLAD_RAN = 0, @@ -49,7 +49,7 @@ enum DataTypes DATA_STATUE_ACTIVATE = 15, }; -enum CreatureIds +enum GDCreatureIds { NPC_SLAD_RAN = 29304, NPC_MOORABI = 29305, @@ -61,7 +61,7 @@ enum CreatureIds NPC_RHINO_SPIRIT = 29791 }; -enum GameObjectIds +enum GDGameObjectIds { GO_SLAD_RAN_ALTAR = 192518, GO_MOORABI_ALTAR = 192519, @@ -79,14 +79,14 @@ enum GameObjectIds GO_COLLISION = 192633, }; -enum SpellIds +enum GDSpellIds { SPELL_FIRE_BEAM_MAMMOTH = 57068, SPELL_FIRE_BEAM_SNAKE = 57071, SPELL_FIRE_BEAM_ELEMENTAL = 57072 }; -enum InstanceMisc +enum GDInstanceMisc { TIMER_STATUE_ACTIVATION = 3500 }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 186920ad07c..108eb862287 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -35,7 +35,7 @@ // * Blood Quickening (DONE) // * Respite for a Tormented Soul -enum Texts +enum ICCTexts { // Highlord Tirion Fordring (at Light's Hammer) SAY_TIRION_INTRO_1 = 0, @@ -100,7 +100,7 @@ enum Texts SAY_CROK_DEATH = 8, }; -enum Spells +enum ICCSpells { // Rotting Frost Giant SPELL_DEATH_PLAGUE = 72879, @@ -176,7 +176,7 @@ enum Spells #define SPELL_MACHINE_GUN (IsUndead ? SPELL_MACHINE_GUN_UNDEAD : SPELL_MACHINE_GUN_NORMAL) #define SPELL_ROCKET_LAUNCH (IsUndead ? SPELL_ROCKET_LAUNCH_UNDEAD : SPELL_ROCKET_LAUNCH_NORMAL) -enum EventTypes +enum ICCEventTypes { // Highlord Tirion Fordring (at Light's Hammer) // The Lich King (at Light's Hammer) @@ -258,12 +258,12 @@ enum EventTypes EVENT_SOUL_MISSILE = 55, }; -enum DataTypesICC +enum ICCDataTypes { DATA_DAMNED_KILLS = 1, }; -enum Actions +enum ICCActions { // Sister Svalna ACTION_KILL_CAPTAIN = 1, @@ -273,7 +273,7 @@ enum Actions ACTION_RESET_EVENT = 5, }; -enum EventIds +enum ICCEventIds { EVENT_AWAKEN_WARD_1 = 22900, EVENT_AWAKEN_WARD_2 = 22907, @@ -281,7 +281,7 @@ enum EventIds EVENT_AWAKEN_WARD_4 = 22909, }; -enum MovementPoints +enum ICCMovementPoints { POINT_LAND = 1, }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 320bb7861cd..8607714ff9c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -37,7 +37,7 @@ extern Position const TerenasSpawnHeroic; extern Position const SpiritWardenSpawn; // Shared spells used by more than one script -enum SharedSpells +enum ICSharedSpells { SPELL_BERSERK = 26662, SPELL_BERSERK2 = 47008, @@ -58,7 +58,7 @@ enum SharedSpells SPELL_SHADOWS_FATE = 71169 }; -enum TeleporterSpells +enum ICTeleporterSpells { LIGHT_S_HAMMER_TELEPORT = 70781, ORATORY_OF_THE_DAMNED_TELEPORT = 70856, @@ -69,7 +69,7 @@ enum TeleporterSpells SINDRAGOSA_S_LAIR_TELEPORT = 70861 }; -enum DataTypes +enum ICDataTypes { // Encounter States/Boss GUIDs DATA_LORD_MARROWGAR = 0, @@ -119,7 +119,7 @@ enum DataTypes DATA_BLOOD_QUEEN_LANA_THEL_COUNCIL = 42 }; -enum CreaturesIds +enum ICCreaturesIds { // At Light's Hammer NPC_HIGHLORD_TIRION_FORDRING_LH = 37119, @@ -323,7 +323,7 @@ enum CreaturesIds NPC_INVISIBLE_STALKER = 30298 }; -enum GameObjectsIds +enum ICGameObjectsIds { // ICC Teleporters GO_SCOURGE_TRANSPORTER_LICHKING = 202223, @@ -429,7 +429,7 @@ enum GameObjectsIds GO_LAVAMAN_PILLARS_UNCHAINED = 202438 }; -enum AchievementCriteriaIds +enum ICAchievementCriteriaIds { // Lord Marrowgar CRITERIA_BONED_10N = 12775, @@ -464,7 +464,7 @@ enum AchievementCriteriaIds CRITERIA_ONCE_BITTEN_TWICE_SHY_25V = 13013 }; -enum SharedActions +enum ICSharedActions { // Icecrown Gunship Battle ACTION_ENEMY_GUNSHIP_TALK = -369390, @@ -496,7 +496,7 @@ enum SharedActions ACTION_FROSTMOURNE_INTRO = -36823 }; -enum WeekliesICC +enum ICWeekliesICC { QUEST_DEPROGRAMMING_10 = 24869, QUEST_DEPROGRAMMING_25 = 24875, @@ -510,7 +510,7 @@ enum WeekliesICC QUEST_RESPITE_FOR_A_TORNMENTED_SOUL_25 = 24880 }; -enum WorldStatesICC +enum ICWorldStatesICC { WORLDSTATE_SHOW_TIMER = 4903, WORLDSTATE_EXECUTION_TIME = 4904, @@ -519,7 +519,7 @@ enum WorldStatesICC WORLDSTATE_ATTEMPTS_MAX = 4942 }; -enum AreaIds +enum ICAreaIds { AREA_ICECROWN_CITADEL = 4812 }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index c80f4e2bbea..c38f388d01b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -68,7 +68,7 @@ enum Actions enum HorsemenData { - DATA_HORSEMEN_IS_TIMED_KILL = Data::DATA_HORSEMEN_CHECK_ACHIEVEMENT_CREDIT, // inherit from naxxramas.h - this needs to be the first entry to ensure that there are no conflicts + DATA_HORSEMEN_IS_TIMED_KILL = NAXData::DATA_HORSEMEN_CHECK_ACHIEVEMENT_CREDIT, // inherit from naxxramas.h - this needs to be the first entry to ensure that there are no conflicts DATA_MOVEMENT_FINISHED, DATA_DEATH_TIME }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 6ad3d2257b5..42c7af5735c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -107,7 +107,7 @@ enum SummonGroups SUMMON_GROUP_GUARDIAN_FIRST = 01 /*..04 */, SUMMON_GROUP_MINION_FIRST = 05 /*..11 */ }; -static const std::initializer_list<Data64> portalList = { DATA_KELTHUZAD_PORTAL01, DATA_KELTHUZAD_PORTAL02, DATA_KELTHUZAD_PORTAL03, DATA_KELTHUZAD_PORTAL04 }; +static const std::initializer_list<NAXData64> portalList = { DATA_KELTHUZAD_PORTAL01, DATA_KELTHUZAD_PORTAL02, DATA_KELTHUZAD_PORTAL03, DATA_KELTHUZAD_PORTAL04 }; enum Phases { @@ -227,7 +227,7 @@ public: } void EnterEvadeMode(EvadeReason /*why*/) override { - for (Data64 portalData : portalList) + for (NAXData64 portalData : portalList) if (GameObject* portal = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(portalData))) portal->SetGoState(GO_STATE_READY); @@ -469,7 +469,7 @@ public: case EVENT_TRANSITION_REPLY: if (Creature* lichKing = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_LICH_KING))) lichKing->AI()->Talk(SAY_ANSWER_REQUEST); - for (Data64 portalData : portalList) + for (NAXData64 portalData : portalList) if (GameObject* portal = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(portalData))) portal->SetGoState(GO_STATE_ACTIVE); break; diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h index 24607c808c0..e847179ddeb 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h @@ -22,7 +22,7 @@ uint32 const EncounterCount = 15; -enum Encounter +enum NAXEncounter { BOSS_ANUBREKHAN, BOSS_FAERLINA, @@ -41,7 +41,7 @@ enum Encounter BOSS_KELTHUZAD }; -enum Data +enum NAXData { DATA_GOTHIK_GATE, DATA_HAD_ANUBREKHAN_GREET, @@ -58,7 +58,7 @@ enum Data DATA_KELTHUZAD_THRONE }; -enum Data64 +enum NAXData64 { DATA_ANUBREKHAN, DATA_FAERLINA, @@ -83,7 +83,7 @@ enum Data64 DATA_LICH_KING }; -enum CreaturesIds +enum NAXCreaturesIds { NPC_ANUBREKHAN = 15956, NPC_FAERLINA = 15953, @@ -111,7 +111,7 @@ enum CreaturesIds NPC_FROGGER = 16027 }; -enum GameObjectsIds +enum NAXGameObjectsIds { GO_HORSEMEN_CHEST_HERO = 193426, GO_HORSEMEN_CHEST = 181366, @@ -168,7 +168,7 @@ enum GameObjectsIds GO_NAXX_PORTAL_MILITARY = 181578 }; -enum InstanceEvents +enum NAXInstanceEvents { // Dialogue that happens after Gothik's death. EVENT_DIALOGUE_GOTHIK_KORTHAZZ = 1, @@ -195,7 +195,7 @@ enum InstanceEvents EVENT_DIALOGUE_SAPPHIRON_KELTHUZAD4 }; -enum InstanceTexts +enum NAXInstanceTexts { // The Four Horsemen SAY_DIALOGUE_GOTHIK_HORSEMAN = 5, 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 e06b5c1023e..52a32da8c60 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h @@ -20,7 +20,7 @@ #define DataHeader "EOE" -enum InstanceData +enum EOEInstanceData { DATA_MALYGOS_EVENT, MAX_ENCOUNTER, @@ -30,7 +30,7 @@ enum InstanceData DATA_RESPAWN_IRIS }; -enum InstanceData64 +enum EOEInstanceData64 { DATA_TRIGGER, DATA_MALYGOS, @@ -41,7 +41,7 @@ enum InstanceData64 DATA_GIFT_BOX_BUNNY_GUID }; -enum InstanceNpcs +enum EOEInstanceNpcs { NPC_MALYGOS = 28859, NPC_VORTEX_TRIGGER = 30090, @@ -57,7 +57,7 @@ enum InstanceNpcs NPC_SURGE_OF_POWER = 30334 }; -enum InstanceGameObjects +enum EOEInstanceGameObjects { GO_NEXUS_RAID_PLATFORM = 193070, GO_EXIT_PORTAL = 193908, @@ -69,12 +69,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/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h index db3db391496..c4b07c78c3b 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h +++ b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h @@ -23,7 +23,7 @@ uint32 const EncounterCount = 5; -enum DataTypes +enum NEXDataTypes { DATA_COMMANDER = 0, DATA_MAGUS_TELESTRA = 1, @@ -36,7 +36,7 @@ enum DataTypes TELESTRAS_CONTAINMET_SPHERE = 7 }; -enum CreatureIds +enum NEXCreatureIds { NPC_ANOMALUS = 26763, NPC_KERISTRASZA = 26723, @@ -56,7 +56,7 @@ enum CreatureIds NPC_COMMANDER_KOLURG = 26798 }; -enum GameObjectIds +enum NEXGameObjectIds { GO_ANOMALUS_CONTAINMET_SPHERE = 188527, GO_ORMOROKS_CONTAINMET_SPHERE = 188528, diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h index 63a50f2ad22..712c7f3963d 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h @@ -23,7 +23,7 @@ uint32 const EncounterCount = 4; -enum DataTypes +enum OCDataTypes { // Encounter States/Boss GUIDs DATA_DRAKOS = 0, @@ -34,7 +34,7 @@ enum DataTypes DATA_CONSTRUCTS = 4 }; -enum CreatureIds +enum OCCreatureIds { NPC_DRAKOS = 27654, NPC_VAROS = 27447, @@ -52,55 +52,55 @@ enum CreatureIds NPC_GREATER_WHELP = 28276 }; -enum GameObjectIds +enum OCGameObjectIds { GO_DRAGON_CAGE_DOOR = 193995, GO_EREGOS_CACHE_N = 191349, GO_EREGOS_CACHE_H = 193603 }; -enum SpellEvents +enum OCSpellEvents { EVENT_CALL_DRAGON = 12229 }; -enum CreatureActions +enum OCCreatureActions { ACTION_CALL_DRAGON_EVENT = 1 }; -enum OculusWorldStates +enum OCOculusWorldStates { WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW = 3524, WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT = 3486 }; -enum OculusSpells +enum OCOculusSpells { SPELL_CENTRIFUGE_SHIELD = 50053, SPELL_DEATH_SPELL = 50415 }; -enum InstanceTexts +enum OCInstanceTexts { SAY_EREGOS_INTRO_TEXT = 0, SAY_VAROS_INTRO_TEXT = 4 }; -enum InstanceEvents +enum OCInstanceEvents { EVENT_VAROS_INTRO = 1, EVENT_EREGOS_INTRO }; -enum ConstructKillState +enum OCConstructKillState { KILL_NO_CONSTRUCT = 0, KILL_ONE_CONSTRUCT = 1, KILL_MORE_CONSTRUCT = 2 }; -enum Misc +enum OCMisc { POINT_MOVE_OUT = 1 }; 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 b58fbeb8e47..2cbbd8556b6 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 @@ uint32 const EncounterCount = 4; -enum DataTypes +enum HOLDataTypes { // Encounter States/Boss GUIDs DATA_BJARNGRIM = 0, @@ -32,7 +32,7 @@ enum DataTypes DATA_LOKEN = 3 }; -enum CreaturesIds +enum HOLCreaturesIds { NPC_BJARNGRIM = 28586, NPC_VOLKHAN = 28587, @@ -40,7 +40,7 @@ enum CreaturesIds NPC_LOKEN = 28923 }; -enum GameObjectIds +enum HOLGameObjectIds { GO_BJARNGRIM_DOOR = 191416, GO_VOLKHAN_DOOR = 191325, 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 a29144236f5..69042bf18f4 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 @@ uint32 const EncounterCount = 4; -enum DataTypes +enum HOSDataTypes { // Encounter States/Boss GUIDs DATA_KRYSTALLUS = 0, @@ -42,7 +42,7 @@ enum DataTypes DATA_GO_SKY_FLOOR = 11 }; -enum CreatureIds +enum HOSCreatureIds { NPC_MAIDEN = 27975, NPC_KRYSTALLUS = 27977, @@ -53,7 +53,7 @@ enum CreatureIds NPC_BRANN = 28070 }; -enum GameObjectIds +enum HOSGameObjectIds { GO_ABEDNEUM = 191669, GO_MARNAK = 191670, diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index 55df3aa86ce..661d8d49ca0 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -275,7 +275,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, diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h index 5104a5a3e73..81a357e4cff 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 @@ uint32 const EncounterCount = 3; -enum DataTypes +enum UKDataTypes { // Encounter States/Boss GUIDs DATA_PRINCE_KELESETH = 0, @@ -39,7 +39,7 @@ enum DataTypes DATA_FORGE_3 = 7 }; -enum CreatureIds +enum UKCreatureIds { NPC_PRINCE_KELESETH = 23953, NPC_SKARVALD = 24200, @@ -56,7 +56,7 @@ enum CreatureIds NPC_ANNHYLDE_THE_CALLER = 24068 }; -enum GameObjectIds +enum UKGameObjectIds { GO_BELLOW_1 = 186688, GO_BELLOW_2 = 186689, diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h index 8ac915da4d3..a2d5004c6e8 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 @@ uint32 const EncounterCount = 4; -enum DataTypes +enum UPDataTypes { // Encounter States/Boss GUIDs DATA_SVALA_SORROWGRAVE = 0, @@ -45,7 +45,7 @@ enum DataTypes DATA_GRAUF = 13 }; -enum CreatureIds +enum UPCreatureIds { // Bosses NPC_SVALA_SORROWGRAVE = 26668, @@ -87,7 +87,7 @@ enum CreatureIds NPC_AVENGING_SPIRIT = 27386 }; -enum GameObjectIds +enum UPGameObjectIds { GO_GORTOK_PALEHOOF_SPHERE = 188593, GO_UTGARDE_MIRROR = 191745, diff --git a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h index 5639804de30..3af77979c68 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h +++ b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h @@ -22,7 +22,7 @@ uint32 const EncounterCount = 4; -enum Data +enum VAData { DATA_ARCHAVON = 0, DATA_EMALON = 1, @@ -30,7 +30,7 @@ enum Data DATA_TORAVON = 3, }; -enum CreatureIds +enum VACreatureIds { NPC_ARCHAVON = 31125, NPC_EMALON = 33993, @@ -38,13 +38,13 @@ enum CreatureIds NPC_TORAVON = 38433 }; -enum AchievementCriteriaIds +enum VAAchievementCriteriaIds { CRITERIA_EARTH_WIND_FIRE_10 = 12018, CRITERIA_EARTH_WIND_FIRE_25 = 12019, }; -enum AchievementSpells +enum VAAchievementSpells { SPELL_EARTH_WIND_FIRE_ACHIEVEMENT_CHECK = 68308, }; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h index 95eb163049d..537c5d51b1e 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.h +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h @@ -40,7 +40,7 @@ extern Position const PortalIntroPositions[]; * 7 - Cyanigosa */ -enum Data +enum VHData { // Main encounters DATA_1ST_BOSS = 0, @@ -83,7 +83,7 @@ enum Data DATA_HANDLE_CELLS }; -enum CreaturesIds +enum VHCreaturesIds { NPC_TELEPORTATION_PORTAL = 30679, NPC_TELEPORTATION_PORTAL_ELITE = 32174, @@ -118,7 +118,7 @@ enum CreaturesIds NPC_DEFENSE_SYSTEM = 30837 }; -enum GameObjectIds +enum VHGameObjectIds { GO_MAIN_DOOR = 191723, GO_XEVOZZ_DOOR = 191556, @@ -133,19 +133,19 @@ enum GameObjectIds GO_INTRO_ACTIVATION_CRYSTAL = 193615 }; -enum WorldStateIds +enum VHWorldStateIds { WORLD_STATE_VH_SHOW = 3816, WORLD_STATE_VH_PRISON_STATE = 3815, WORLD_STATE_VH_WAVE_COUNT = 3810, }; -enum Events +enum VHEvents { EVENT_ACTIVATE_CRYSTAL = 20001 }; -enum InstanceMisc +enum VHInstanceMisc { ACTION_SINCLARI_OUTRO = 1, POINT_INTRO = 1 |
