diff options
Diffstat (limited to 'src')
15 files changed, 20 insertions, 20 deletions
diff --git a/src/bindings/scripts/include/sc_gossip.h b/src/bindings/scripts/include/sc_gossip.h index 22e05c9dec8..5c8ded7d579 100644 --- a/src/bindings/scripts/include/sc_gossip.h +++ b/src/bindings/scripts/include/sc_gossip.h @@ -73,7 +73,7 @@ #define GOSSIP_TEXT_FISHING "Fishing" #define GOSSIP_TEXT_SKINNING "Skinning" -enum eEnums +enum eTradeskill { // Skill defines TRADESKILL_ALCHEMY = 1, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/def_blackrock_depths.h b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/def_blackrock_depths.h index ed0807ff4f7..6ced6bafe15 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/def_blackrock_depths.h +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/def_blackrock_depths.h @@ -9,7 +9,7 @@ #define FACTION_HOSTILE 754 #define FACTION_FRIEND 35 -enum eEnums +enum eTypes { TYPE_RING_OF_LAW = 1, TYPE_VAULT = 2, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/def_zulgurub.h b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/def_zulgurub.h index 9fe3bf25741..bf55a54c1d5 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/def_zulgurub.h +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/def_zulgurub.h @@ -5,7 +5,7 @@ #ifndef DEF_ZULGURUB_H #define DEF_ZULGURUB_H -enum eEnums +enum eTypes { MAX_ENCOUNTERS = 8, diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/def_hyjal.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/def_hyjal.h index d5fc0541758..bf2d6d99f90 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/def_hyjal.h +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/def_hyjal.h @@ -7,7 +7,7 @@ #define ERROR_INST_DATA "TSCR: Instance data not set properly for Mount Hyjal. Encounters will be buggy" -enum eEnums +enum eTypes { WORLD_STATE_WAVES = 2842, WORLD_STATE_ENEMY = 2453, diff --git a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp index e371c8bcc1f..2b21db67794 100644 --- a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp +++ b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp @@ -341,7 +341,7 @@ bool GossipSelect_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature* pCre ## npc_OOX17 ######*/ -enum eEnums +enum e00X17 { //texts are signed for 7806 SAY_OOX_START = -1000287, @@ -433,7 +433,7 @@ CreatureAI* GetAI_npc_OOX17(Creature* pCreature) # npc_tooga ####*/ -enum eEnums +enum eTooga { SAY_TOOG_THIRST = -1000391, SAY_TOOG_WORRIED = -1000392, diff --git a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/def_wailing_caverns.h b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/def_wailing_caverns.h index 77a4b40594e..f6c7bee8571 100644 --- a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/def_wailing_caverns.h +++ b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/def_wailing_caverns.h @@ -5,7 +5,7 @@ #ifndef DEF_WAILING_CAVERNS_H #define DEF_WAILING_CAVERNS_H -enum eEnums +enum eTypes { TYPE_LORD_COBRAHN = 1, TYPE_LORD_PYTHAS = 2, diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/def_nexus.h b/src/bindings/scripts/scripts/northrend/nexus/nexus/def_nexus.h index 411d0cf5f15..de36fea4b93 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/def_nexus.h +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/def_nexus.h @@ -1,7 +1,7 @@ #ifndef DEF_NEXUS_H #define DEF_NEXUS_H -enum eEnums +enum eTypes { DATA_MAGUS_TELESTRA_EVENT, DATA_ANOMALUS_EVENT, diff --git a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/def_obsidian_sanctum.h b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/def_obsidian_sanctum.h index 07ccee91a9a..59013174795 100644 --- a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/def_obsidian_sanctum.h +++ b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/def_obsidian_sanctum.h @@ -1,7 +1,7 @@ #ifndef DEF_OBSIDIAN_SANCTUM_H #define DEF_OBSIDIAN_SANCTUM_H -enum eEnums +enum eTypes { TYPE_SARTHARION_EVENT = 1, diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/def_halls_of_lightning.h b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/def_halls_of_lightning.h index 39a8e5fcc5d..d9739fdf888 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/def_halls_of_lightning.h +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/def_halls_of_lightning.h @@ -5,7 +5,7 @@ #ifndef DEF_HALLS_OF_LIGHTNING_H #define DEF_HALLS_OF_LIGHTNING_H -enum eEnums +enum eTypes { MAX_ENCOUNTER = 4, diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/def_ulduar.h b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/def_ulduar.h index 5c301fc5dcd..ed7686343fb 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/def_ulduar.h +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/def_ulduar.h @@ -19,7 +19,7 @@ #ifndef DEF_ULDUAR_H #define DEF_ULDUAR_H -enum eEnums +enum eTypes { MAX_ENCOUNTER = 14, diff --git a/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp index 4bfb67b6b9f..e352533c7c5 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp @@ -28,7 +28,7 @@ EndContentData */ #include "precompiled.h" -enum eEnums +enum ePrince { SAY_INTRO = -1557000, SAY_AGGRO_1 = -1557001, @@ -293,7 +293,7 @@ CreatureAI* GetAI_mob_ethereal_beacon(Creature* pCreature) return new mob_ethereal_beaconAI (pCreature); } -enum eEnums +enum eEthereal { SPELL_ETHEREAL_APPRENTICE_FIREBOLT = 32369, SPELL_ETHEREAL_APPRENTICE_FROSTBOLT = 32370 diff --git a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/def_sethekk_halls.h b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/def_sethekk_halls.h index a0c329bbe1b..79a6cd4952d 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/def_sethekk_halls.h +++ b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/def_sethekk_halls.h @@ -5,7 +5,7 @@ #ifndef DEF_SETHEKK_HALLS_H #define DEF_SETHEKK_HALLS_H -enum eEnums +enum eTypes { DATA_IKISSDOOREVENT = 1, TYPE_ANZU_ENCOUNTER = 2, diff --git a/src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h b/src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h index 8fddcc44074..ea60c281918 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h +++ b/src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h @@ -5,7 +5,7 @@ #ifndef DEF_BLACK_TEMPLE_H #define DEF_BLACK_TEMPLE_H -enum eEnums +enum eTypes { DATA_AKAMA = 1, DATA_AKAMA_SHADE = 2, diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp index 726af0203ff..50497d0c073 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp @@ -29,7 +29,7 @@ EndContentData */ #include "precompiled.h" #include "def_blood_furnace.h" -enum eEnums +enum eKelidan { SAY_WAKE = -1542000, SAY_ADD_AGGRO_1 = -1542001, @@ -264,7 +264,7 @@ CreatureAI* GetAI_boss_kelidan_the_breaker(Creature* pCreature) ## mob_shadowmoon_channeler ######*/ -enum eEnums +enum eShadowmoon { SPELL_SHADOW_BOLT = 12739, H_SPELL_SHADOW_BOLT = 15472, diff --git a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp index 602a09fa76a..3a6a121ff4d 100644 --- a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp @@ -46,7 +46,7 @@ EndContentData */ # mob_mature_netherwing_drake #####*/ -enum eEnums +enum eMatureNetherwing { SAY_JUST_EATEN = -1000222, @@ -623,7 +623,7 @@ bool GossipSelect_npc_oronok_tornheart(Player* pPlayer, Creature* pCreature, uin # npc_karynaku ####*/ -enum eEnums +enum eKarynaku { QUEST_ALLY_OF_NETHER = 10870, @@ -852,7 +852,7 @@ bool QuestAccept_npc_overlord_morghor(Player* pPlayer, Creature* pCreature, cons # npc_earthmender_wilda ####*/ -enum eEnums +enum eEarthmender { SAY_WIL_START = -1000381, SAY_WIL_AGGRO1 = -1000382, |