diff options
Diffstat (limited to 'src')
107 files changed, 174 insertions, 180 deletions
diff --git a/src/bindings/scripts/base/escort_ai.cpp b/src/bindings/scripts/base/escort_ai.cpp index b5bbc74265e..4d6083ab470 100644 --- a/src/bindings/scripts/base/escort_ai.cpp +++ b/src/bindings/scripts/base/escort_ai.cpp @@ -12,7 +12,7 @@ EndScriptData */ #include "precompiled.h" #include "escort_ai.h" -enum +enum ePoints { POINT_LAST_POINT = 0xFFFFFF, POINT_HOME = 0xFFFFFE diff --git a/src/bindings/scripts/base/follower_ai.cpp b/src/bindings/scripts/base/follower_ai.cpp index 25ee1265a91..8284af7aec0 100644 --- a/src/bindings/scripts/base/follower_ai.cpp +++ b/src/bindings/scripts/base/follower_ai.cpp @@ -14,7 +14,7 @@ EndScriptData */ const float MAX_PLAYER_DISTANCE = 100.0f; -enum +enum ePoints { POINT_COMBAT_START = 0xFFFFFF }; diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index 1320fdb4776..21c8842fb44 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -531,7 +531,7 @@ void ScriptedAI::SetCombatMovement(bool bCombatMove) m_bCombatMovement = bCombatMove; } -enum +enum eNPCs { NPC_BROODLORD = 12017, NPC_VOID_REAVER = 19516, diff --git a/src/bindings/scripts/include/sc_gossip.h b/src/bindings/scripts/include/sc_gossip.h index 454aef99de0..22e05c9dec8 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 +enum eEnums { // Skill defines TRADESKILL_ALCHEMY = 1, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/arathi_highlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/arathi_highlands.cpp index e9169ae60f6..60255570c59 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/arathi_highlands.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/arathi_highlands.cpp @@ -32,7 +32,7 @@ EndContentData */ ## npc_professor_phizzlethorpe ######*/ -enum +enum eEnums { SAY_PROGRESS_1 = -1000235, SAY_PROGRESS_2 = -1000236, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp index 51f7d7a92e8..a7bb66ac9cf 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp @@ -60,7 +60,7 @@ bool GOHello_go_shadowforge_brazier(Player* pPlayer, GameObject* pGo) ## npc_grimstone ######*/ -enum +enum eGrimstone { NPC_GRIMSTONE = 10096, NPC_THELDREN = 16059, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp index fe55400544d..80b2ea8ac08 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_blackrock_depths.h" -enum +enum eEnums { SPELL_SMELT_DARK_IRON = 14891, SPELL_LEARN_SMELT = 14894, @@ -77,7 +77,7 @@ bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature* pCreature, uint32 uiS return true; } -enum +enum eSpells { SPELL_SHADOWBOLTVOLLEY = 15245, SPELL_IMMOLATE = 12742, 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 ff82cfd0879..ed0807ff4f7 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 +enum eEnums { TYPE_RING_OF_LAW = 1, TYPE_VAULT = 2, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp index 61de8176b5a..f14b7603fa7 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp @@ -34,7 +34,7 @@ update `instance_template` set `script`='instance_blackrock_depths' where `map`= #define TIMER_TOMBOFTHESEVEN 15000 -enum +enum eEnums { MAX_ENCOUNTER = 6, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/ghostlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/ghostlands.cpp index d93d5467d58..8dd1a67a0fc 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/ghostlands.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/ghostlands.cpp @@ -135,7 +135,7 @@ bool GOHello_gilded_brazier(Player* pPlayer, GameObject* pGo) ## npc_ranger_lilatha ######*/ -enum +enum eEnums { SAY_START = -1000140, SAY_PROGRESS1 = -1000141, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp index 9873a7a6130..2a4bf67868b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp @@ -33,7 +33,7 @@ EndContentData */ ## npc_00x09hl ######*/ -enum +enum eOOX { SAY_OOX_START = -1000287, SAY_OOX_AGGRO1 = -1000288, @@ -144,7 +144,7 @@ CreatureAI* GetAI_npc_00x09hl(Creature* pCreature) ## npc_rinji ######*/ -enum +enum eRinji { SAY_RIN_FREE = -1000403, //from here SAY_RIN_BY_OUTRUNNER = -1000404, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h index 67cb5e6ece5..1c4c1f37eb0 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h @@ -6,7 +6,7 @@ #ifndef DEF_KARAZHAN_H #define DEF_KARAZHAN_H -enum +enum eEnums { TYPE_ATTUMEN = 1, TYPE_MOROES = 2, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp index c8829f4d2ba..f392c50ca13 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp @@ -393,7 +393,7 @@ bool GossipSelect_npc_barnes(Player* pPlayer, Creature* pCreature, uint32 uiSend # npc_berthold ####*/ -enum +enum eBerthold { SPELL_TELEPORT = 39567 }; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp index eb6c303167c..546f42cae19 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp @@ -46,7 +46,7 @@ static Speech PlayerDeath[]= {-1585021}, }; -enum +enum eEnums { SAY_AGGRO = -1585012, SAY_DEATH = -1585022, @@ -339,7 +339,7 @@ CreatureAI* GetAI_boss_priestess_delrissa(Creature* pCreature) return new boss_priestess_delrissaAI(pCreature); } -enum +enum eHealingPotion { SPELL_HEALING_POTION = 15503 }; @@ -478,7 +478,7 @@ struct TRINITY_DLL_DECL boss_priestess_lackey_commonAI : public ScriptedAI } }; -enum +enum eRogueSpells { SPELL_KIDNEY_SHOT = 27615, SPELL_GOUGE = 12540, @@ -575,7 +575,7 @@ CreatureAI* GetAI_boss_kagani_nightstrike(Creature* pCreature) return new boss_kagani_nightstrikeAI(pCreature); } -enum +enum eWarlockSpells { SPELL_IMMOLATE = 44267, SPELL_SHADOW_BOLT = 12471, @@ -665,7 +665,7 @@ CreatureAI* GetAI_ellris_duskhallow(Creature* pCreature) return new boss_ellris_duskhallowAI(pCreature); } -enum +enum eKickDown { SPELL_KNOCKDOWN = 11428, SPELL_SNAP_KICK = 46182 @@ -715,7 +715,7 @@ CreatureAI* GetAI_eramas_brightblaze(Creature* pCreature) return new boss_eramas_brightblazeAI(pCreature); } -enum +enum eMageSpells { SPELL_POLYMORPH = 13323, SPELL_ICE_BLOCK = 27619, @@ -839,7 +839,7 @@ CreatureAI* GetAI_yazzai(Creature* pCreature) return new boss_yazzaiAI(pCreature); } -enum +enum eWarriorSpells { SPELL_INTERCEPT_STUN = 27577, SPELL_DISARM = 27581, @@ -952,7 +952,7 @@ CreatureAI* GetAI_warlord_salaris(Creature* pCreature) return new boss_warlord_salarisAI(pCreature); } -enum +enum eHunterSpells { SPELL_AIMED_SHOT = 44271, SPELL_SHOOT = 15620, @@ -1159,7 +1159,7 @@ CreatureAI* GetAI_apoko(Creature* pCreature) return new boss_apokoAI(pCreature); } -enum +enum eEngineerSpells { SPELL_GOBLIN_DRAGON_GUN = 44272, SPELL_ROCKET_LAUNCH = 44137, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp index 90a118e6da2..82b5980ca44 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_magisters_terrace.h" -enum +enum eEnums { SAY_AGGRO = -1585007, SAY_ENERGY = -1585008, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp index d9b33bbf4fc..b23d5e72186 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp @@ -31,7 +31,7 @@ EndContentData */ ## npc_kalecgos ######*/ -enum +enum eEnums { SPELL_TRANSFORM_TO_KAEL = 44670, SPELL_ORB_KILL_CREDIT = 46307, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp index ad7470c2687..3fedad28827 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_molten_core.h" -enum +enum eEnums { SPELL_MAGMASPLASH = 13879, SPELL_PYROBLAST = 20228, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp index 8d81fd7055a..82c5b42a751 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp @@ -27,7 +27,7 @@ #define GCD_CAST 1 -enum +enum eDeathKnightSpells { SPELL_SOUL_PRISON_CHAIN_SELF = 54612, SPELL_SOUL_PRISON_CHAIN = 54613, @@ -311,7 +311,7 @@ bool GOHello_go_acherus_soul_prison(Player* pPlayer, GameObject* pGo) #define GOSSIP_ACCEPT_DUEL "I challenge you, death knight!" -enum +enum eDuelEnums { SAY_DUEL_A = -1609080, SAY_DUEL_B = -1609081, @@ -566,7 +566,7 @@ CreatureAI* GetAI_npc_dark_rider_of_acherus(Creature* pCreature) ## npc_salanar_the_horseman ######*/ -enum +enum eSalanar { REALM_OF_SHADOWS = 52693, EFFECT_STOLEN_HORSE = 52263, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp index e8fce0467ad..51a8d6efc8d 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" -enum +enum eEnums { SAY_AGGRO = -1189019, SAY_SPECIALAE = -1189020, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp index 7cf9924f269..b7cba1ae97a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" -enum +enum eEnums { SAY_AGGRO = -1189016, SAY_HEALTH = -1189017, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp index d94a55bfad5..13e9ef4af53 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" -enum +enum eSpells { SPELL_CURSEOFBLOOD = 8282, SPELL_DISPELMAGIC = 15090, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp index 063ca31d0cf..2e79f2449d0 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" -enum +enum eEnums { SAY_AGGRO = -1189021, SPELL_SUMMONSCARLETHOUND = 17164, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp index 3f84acbd5f1..c0b02a2c370 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_scarlet_monastery.h" -enum +enum eEnums { SAY_AGGRO = -1189011, SAY_HEALTH1 = -1189012, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp index 95a421fed13..9859f3b8bd7 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_scarlet_monastery.h" -enum +enum eEnums { //Mograine says SAY_MO_AGGRO = -1189005, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp index 8045f8ee62b..51ace6a6e21 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_scholomance.h" -enum +enum eEnums { EMOTE_GENERIC_FRENZY_KILL = -1000001, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp index 0f4a75781d9..f3eef33d24a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" -enum +enum eEnums { EMOTE_GENERIC_FRENZY_KILL = -1000001, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp index 5c3cf162b94..29a8d04a1cb 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp @@ -26,7 +26,7 @@ EndScriptData */ #define MAX_ENCOUNTER 4 -enum +enum eEnums { SAY_BOSS_DIE_AD = -1033007, SAY_BOSS_DIE_AS = -1033008, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp index 7630f57f14d..dddf80ee4bb 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp @@ -33,7 +33,7 @@ EndContentData */ ## npc_shadowfang_prisoner ######*/ -enum +enum eEnums { SAY_FREE_AS = -1033000, SAY_OPEN_DOOR_AS = -1033001, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/silverpine_forest.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/silverpine_forest.cpp index 694eeb3f22d..7a70d646fae 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/silverpine_forest.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/silverpine_forest.cpp @@ -92,7 +92,7 @@ bool GossipSelect_npc_astor_hadren(Player* pPlayer, Creature* pCreature, uint32 ## npc_deathstalker_erland ######*/ -enum +enum eErland { SAY_QUESTACCEPT = -1000335, SAY_START = -1000336, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stormwind_city.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stormwind_city.cpp index 265c3ae3397..5e495d6e1e6 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stormwind_city.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stormwind_city.cpp @@ -64,7 +64,7 @@ bool GossipSelect_npc_archmage_malin(Player* pPlayer, Creature* pCreature, uint3 ## npc_bartleby ######*/ -enum +enum eBartleby { FACTION_ENEMY = 168, QUEST_BEAT = 1640 @@ -129,7 +129,7 @@ CreatureAI* GetAI_npc_bartleby(Creature* pCreature) ## npc_dashel_stonefist ######*/ -enum +enum eDashel { QUEST_MISSING_DIPLO_PT8 = 1447, FACTION_HOSTILE = 168 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp index fa9472dcbb1..91477d3fef5 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" -enum +enum eEnums { //Dathrohan spells SPELL_CRUSADERSHAMMER = 17286, //AOE stun diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp index db0a35ec548..1d0473e1d9b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp @@ -166,7 +166,7 @@ CreatureAI* GetAI_mob_restless_soul(Creature* pCreature) ## mobs_spectral_ghostly_citizen ######*/ -enum +enum eGhostlyCitizenSpells { SPELL_HAUNTING_PHANTOM = 16336, SPELL_SLAP = 6754 diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/tirisfal_glades.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/tirisfal_glades.cpp index 16176654e73..ba2a9cd762a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/tirisfal_glades.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/tirisfal_glades.cpp @@ -33,7 +33,7 @@ EndContentData */ ## npc_calvin_montague ######*/ -enum +enum eCalvin { SAY_COMPLETE = -1000431, SPELL_DRINK = 2639, // possibly not correct spell (but iconId is correct) @@ -148,7 +148,7 @@ bool QuestAccept_npc_calvin_montague(Player* pPlayer, Creature* pCreature, Quest ## go_mausoleum_trigger ######*/ -enum +enum eMausoleum { QUEST_ULAG = 1819, NPC_ULAG = 6390, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/western_plaguelands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/western_plaguelands.cpp index 9738ae652ca..4181bc89867 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/western_plaguelands.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/western_plaguelands.cpp @@ -95,7 +95,7 @@ bool GossipSelect_npcs_dithers_and_arbington(Player* pPlayer, Creature* pCreatur ## npc_myranda_the_hag ######*/ -enum +enum eMyranda { QUEST_SUBTERFUGE = 5862, QUEST_IN_DREAMS = 5944, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp index 50bb8f5035b..d50d0fa2d2d 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp @@ -33,7 +33,7 @@ EndContentData */ ## npc_tapoke_slim_jahn ######*/ -enum +enum eTapokeSlim { QUEST_MISSING_DIPLO_PT11 = 1249, FACTION_ENEMY = 168, diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp index 4009396c28f..5244e5d3538 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp @@ -37,7 +37,7 @@ bool GOHello_go_gong_of_bethekk(Player* pPlayer, GameObject* pGo) return false; } -enum +enum eEnums { SAY_AGGRO = -1309011, SAY_FEAST_PANTHER = -1309012, 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 3aab5b24b56..9fe3bf25741 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 +enum eEnums { MAX_ENCOUNTERS = 8, diff --git a/src/bindings/scripts/scripts/examples/example_creature.cpp b/src/bindings/scripts/scripts/examples/example_creature.cpp index 7a488716db4..c932f3387f9 100644 --- a/src/bindings/scripts/scripts/examples/example_creature.cpp +++ b/src/bindings/scripts/scripts/examples/example_creature.cpp @@ -35,7 +35,7 @@ EndScriptData */ // Functions with Handled Function marked above them are functions that are called automatically by the core // Functions that are marked Custom Function are functions I've created to simplify code -enum +enum eEnums { //List of text id's. The text is stored in database, also in a localized version //(if translation not exist for the textId, default english text will be used) diff --git a/src/bindings/scripts/scripts/examples/example_escort.cpp b/src/bindings/scripts/scripts/examples/example_escort.cpp index e53e65ebdce..027268a9325 100644 --- a/src/bindings/scripts/scripts/examples/example_escort.cpp +++ b/src/bindings/scripts/scripts/examples/example_escort.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "escort_ai.h" -enum +enum eEnums { NPC_FELBOAR = 21878, diff --git a/src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp b/src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp index 50ddf9d3202..9a51d4d4c9a 100644 --- a/src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp +++ b/src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include <cstring> -enum +enum eEnums { SPELL_POLYMORPH = 12826, SPELL_MARK_OF_THE_WILD = 26990, diff --git a/src/bindings/scripts/scripts/examples/example_misc.cpp b/src/bindings/scripts/scripts/examples/example_misc.cpp index 1bb1a7a0b9a..667c30ad1b6 100644 --- a/src/bindings/scripts/scripts/examples/example_misc.cpp +++ b/src/bindings/scripts/scripts/examples/example_misc.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" -enum +enum eSay { SAY_HI = -1999925 }; diff --git a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp index 313b34f4a70..5527ca61996 100644 --- a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp +++ b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp @@ -164,7 +164,7 @@ CreatureAI* GetAI_npc_draenei_survivor(Creature* pCreature) ## npc_engineer_spark_overgrind ######*/ -enum +enum eOvergrind { SAY_TEXT = -1000256, SAY_EMOTE = -1000257, @@ -307,7 +307,7 @@ CreatureAI* GetAI_npc_injured_draenei(Creature* pCreature) ## npc_magwin ######*/ -enum +enum eMagwin { SAY_START = -1000111, SAY_AGGRO = -1000112, @@ -378,7 +378,7 @@ CreatureAI* GetAI_npc_magwinAI(Creature* pCreature) ## npc_geezle ######*/ -enum +enum eGeezle { QUEST_TREES_COMPANY = 9531, @@ -537,7 +537,7 @@ CreatureAI* GetAI_npc_geezleAI(Creature* pCreature) ## mob_nestlewood_owlkin ######*/ -enum +enum eOwlkin { SPELL_INOCULATE_OWLKIN = 29528, ENTRY_OWLKIN = 16518, diff --git a/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/def_blackfathom_deeps.h b/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/def_blackfathom_deeps.h index 6a1b1974886..097554708b7 100644 --- a/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/def_blackfathom_deeps.h +++ b/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/def_blackfathom_deeps.h @@ -5,7 +5,7 @@ #ifndef DEF_BFD_H #define DEF_BFD_H -enum +enum eEnums { DATA_SHRINE1 = 1, DATA_SHRINE2 = 2, diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp index 4cd7bf713c5..ea3bdc45a6f 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_dark_portal.h" -enum +enum eEnums { SAY_ENTER = -1269012, SAY_AGGRO = -1269013, diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp index 244b161de69..eb0471fc278 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_dark_portal.h" -enum +enum eEnums { SAY_ENTER = -1269006, SAY_AGGRO = -1269007, diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp index 3568e5ada4f..5b09e4cb117 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_dark_portal.h" -enum +enum eEnums { SAY_ENTER = -1269000, SAY_AGGRO = -1269001, 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 c08f28a4f3d..d5fc0541758 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 +enum eEnums { WORLD_STATE_WAVES = 2842, WORLD_STATE_ENEMY = 2453, diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp index d030fdf66ed..81b51507463 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp @@ -25,7 +25,7 @@ EndScriptData */ #include "def_hyjal.h" #include "hyjal_trash.h" -enum +enum eEnums { MAX_ENCOUNTER = 5, diff --git a/src/bindings/scripts/scripts/kalimdor/darkshore.cpp b/src/bindings/scripts/scripts/kalimdor/darkshore.cpp index 2ed0d8df73b..1354c2bc861 100644 --- a/src/bindings/scripts/scripts/kalimdor/darkshore.cpp +++ b/src/bindings/scripts/scripts/kalimdor/darkshore.cpp @@ -35,7 +35,7 @@ EndContentData */ # npc_kerlonian ####*/ -enum +enum eKerlonian { SAY_KER_START = -1000434, @@ -172,7 +172,7 @@ bool QuestAccept_npc_kerlonian(Player* pPlayer, Creature* pCreature, const Quest # npc_prospector_remtravel ####*/ -enum +enum eRemtravel { SAY_REM_START = -1000415, // signed for 4966 SAY_REM_AGGRO = -1000427, // signed for 9999 @@ -299,7 +299,7 @@ bool QuestAccept_npc_prospector_remtravel(Player* pPlayer, Creature* pCreature, # npc_threshwackonator ####*/ -enum +enum eThreshwackonator { EMOTE_START = -1000413, //signed for 4966 SAY_AT_CLOSE = -1000414, //signed for 4966 diff --git a/src/bindings/scripts/scripts/kalimdor/desolace.cpp b/src/bindings/scripts/scripts/kalimdor/desolace.cpp index b0ed3ca004a..02702f77c15 100644 --- a/src/bindings/scripts/scripts/kalimdor/desolace.cpp +++ b/src/bindings/scripts/scripts/kalimdor/desolace.cpp @@ -27,7 +27,7 @@ EndContentData */ #include "precompiled.h" -enum +enum eDyingKodo { // signed for 9999 SAY_SMEED_HOME_1 = -1000428, diff --git a/src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp b/src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp index 4512c8d0648..8f33a569c3e 100644 --- a/src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp +++ b/src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp @@ -37,7 +37,7 @@ EndContentData */ ## mobs_risen_husk_spirit ######*/ -enum +enum eHuskSpirit { QUEST_WHATS_HAUNTING_WITCH_HILL = 11180, SPELL_SUMMON_RESTLESS_APPARITION = 42511, @@ -121,7 +121,7 @@ bool GossipHello_npc_restless_apparition(Player* pPlayer, Creature* pCreature) ## npc_deserter_agitator ######*/ -enum +enum eAgitator { QUEST_TRAITORS_AMONG_US = 11126, FACTION_THER_DESERTER = 1883 @@ -159,7 +159,7 @@ bool GossipHello_npc_deserter_agitator(Player* pPlayer, Creature* pCreature) ## npc_lady_jaina_proudmoore ######*/ -enum +enum eLadyJaina { QUEST_JAINAS_AUTOGRAPH = 558, SPELL_JAINAS_AUTOGRAPH = 23122 @@ -194,7 +194,7 @@ bool GossipSelect_npc_lady_jaina_proudmoore(Player* pPlayer, Creature* pCreature ## npc_nat_pagle ######*/ -enum +enum eNatPagle { QUEST_NATS_MEASURING_TAPE = 8227 }; @@ -227,7 +227,7 @@ bool GossipSelect_npc_nat_pagle(Player* pPlayer, Creature* pCreature, uint32 uiS ## npc_private_hendel ######*/ -enum +enum eHendel { // looks like all this text ids are wrong. SAY_PROGRESS_1_TER = -1000411, // signed for 3568 diff --git a/src/bindings/scripts/scripts/kalimdor/feralas.cpp b/src/bindings/scripts/scripts/kalimdor/feralas.cpp index e20e35d818a..9a3df7c06e2 100644 --- a/src/bindings/scripts/scripts/kalimdor/feralas.cpp +++ b/src/bindings/scripts/scripts/kalimdor/feralas.cpp @@ -58,7 +58,7 @@ bool GossipSelect_npc_gregan_brewspewer(Player* pPlayer, Creature* pCreature, ui ## npc_oox22fe ######*/ -enum +enum eOOX { //signed for 7806 SAY_OOX_START = -1000287, diff --git a/src/bindings/scripts/scripts/kalimdor/moonglade.cpp b/src/bindings/scripts/scripts/kalimdor/moonglade.cpp index ca1936685ec..7e52c16b74d 100644 --- a/src/bindings/scripts/scripts/kalimdor/moonglade.cpp +++ b/src/bindings/scripts/scripts/kalimdor/moonglade.cpp @@ -36,7 +36,7 @@ EndContentData */ ## npc_bunthen_plainswind ######*/ -enum +enum eBunthen { QUEST_SEA_LION_HORDE = 30, QUEST_SEA_LION_ALLY = 272, diff --git a/src/bindings/scripts/scripts/kalimdor/mulgore.cpp b/src/bindings/scripts/scripts/kalimdor/mulgore.cpp index 9e3b78181d7..0fcd62cd8df 100644 --- a/src/bindings/scripts/scripts/kalimdor/mulgore.cpp +++ b/src/bindings/scripts/scripts/kalimdor/mulgore.cpp @@ -61,7 +61,7 @@ bool GossipSelect_npc_skorn_whitecloud(Player* pPlayer, Creature* pCreature, uin # npc_kyle_frenzied ######*/ -enum +enum eKyleFrenzied { //emote signed for 7780 but propably thats wrong id. EMOTE_SEE_LUNCH = -1000407, diff --git a/src/bindings/scripts/scripts/kalimdor/orgrimmar.cpp b/src/bindings/scripts/scripts/kalimdor/orgrimmar.cpp index db06eee38a0..30129b7e037 100644 --- a/src/bindings/scripts/scripts/kalimdor/orgrimmar.cpp +++ b/src/bindings/scripts/scripts/kalimdor/orgrimmar.cpp @@ -69,7 +69,7 @@ bool GossipSelect_npc_neeru_fireblade(Player* pPlayer, Creature* pCreature, uint ## npc_shenthul ######*/ -enum +enum eShenthul { QUEST_SHATTERED_SALUTE = 2460 }; diff --git a/src/bindings/scripts/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp b/src/bindings/scripts/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp index 8abb2d61e99..0d133a0db0b 100644 --- a/src/bindings/scripts/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp +++ b/src/bindings/scripts/scripts/kalimdor/razorfen_downs/razorfen_downs.cpp @@ -31,7 +31,7 @@ EndContentData */ # npc_henry_stern ####*/ -enum +enum eEnums { SPELL_GOLDTHORN_TEA = 13028, SPELL_TEACHING_GOLDTHORN_TEA = 13029, diff --git a/src/bindings/scripts/scripts/kalimdor/silithus.cpp b/src/bindings/scripts/scripts/kalimdor/silithus.cpp index 6bf17f80314..396b09ea331 100644 --- a/src/bindings/scripts/scripts/kalimdor/silithus.cpp +++ b/src/bindings/scripts/scripts/kalimdor/silithus.cpp @@ -204,7 +204,7 @@ bool GossipSelect_npcs_rutgar_and_frankal(Player* pPlayer, Creature* pCreature, /*#### # quest_a_pawn_on_the_eternal_board (Defines) ####*/ -enum +enum eEternalBoard { QUEST_A_PAWN_ON_THE_ETERNAL_BOARD = 8519, diff --git a/src/bindings/scripts/scripts/kalimdor/stonetalon_mountains.cpp b/src/bindings/scripts/scripts/kalimdor/stonetalon_mountains.cpp index e013ef72089..2e1ebc683fd 100644 --- a/src/bindings/scripts/scripts/kalimdor/stonetalon_mountains.cpp +++ b/src/bindings/scripts/scripts/kalimdor/stonetalon_mountains.cpp @@ -80,7 +80,7 @@ bool GossipSelect_npc_braug_dimspirit(Player* pPlayer, Creature* pCreature, uint ## npc_kaya_flathoof ######*/ -enum +enum eKaya { FACTION_ESCORTEE_H = 775, diff --git a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp index 543b7e21c5f..e371c8bcc1f 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 +enum eEnums { //texts are signed for 7806 SAY_OOX_START = -1000287, diff --git a/src/bindings/scripts/scripts/kalimdor/teldrassil.cpp b/src/bindings/scripts/scripts/kalimdor/teldrassil.cpp index c5aee3248bf..8ab8d98218a 100644 --- a/src/bindings/scripts/scripts/kalimdor/teldrassil.cpp +++ b/src/bindings/scripts/scripts/kalimdor/teldrassil.cpp @@ -32,7 +32,7 @@ EndContentData */ # npc_mist ####*/ -enum +enum eMist { SAY_AT_HOME = -1000411, EMOTE_AT_HOME = -1000412, diff --git a/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp b/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp index 8d0a078755a..70e0b3e5e28 100644 --- a/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp +++ b/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp @@ -39,7 +39,7 @@ EndContentData */ #define GOSSIP_CORPSE "Examine corpse in detail..." -enum +enum eQuests { QUEST_LOST_IN_BATTLE = 4921 }; @@ -67,7 +67,7 @@ bool GossipSelect_npc_beaten_corpse(Player* pPlayer, Creature* pCreature, uint32 # npc_gilthares ######*/ -enum eEnums +enum eGilthares { SAY_GIL_START = -1000370, SAY_GIL_AT_LAST = -1000371, @@ -190,7 +190,7 @@ bool GossipSelect_npc_sputtervalve(Player* pPlayer, Creature* pCreature, uint32 ## npc_taskmaster_fizzule ######*/ -enum +enum eEnums { FACTION_FRIENDLY_F = 35, SPELL_FLARE = 10113, @@ -499,7 +499,7 @@ CreatureAI* GetAI_npc_twiggy_flathead(Creature* pCreature) ## npc_wizzlecrank_shredder #####*/ -enum +enum eEnums_Wizzlecrank { SAY_START = -1000272, SAY_STARTUP1 = -1000273, diff --git a/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp b/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp index 24e6a21e743..9616aa4acf6 100644 --- a/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp +++ b/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp @@ -35,7 +35,7 @@ EndContentData */ # npc_kanati ######*/ -enum +enum eKanati { SAY_KAN_START = -1000410, @@ -99,7 +99,7 @@ bool QuestAccept_npc_kanati(Player* pPlayer, Creature* pCreature, const Quest* p # npc_lakota_windsong ######*/ -enum +enum eLakota { SAY_LAKO_START = -1000365, SAY_LAKO_LOOK_OUT = -1000366, @@ -186,7 +186,7 @@ bool QuestAccept_npc_lakota_windsong(Player* pPlayer, Creature* pCreature, const # npc_paoka_swiftmountain ######*/ -enum +enum ePacka { SAY_START = -1000147, SAY_WYVERN = -1000148, @@ -261,7 +261,7 @@ bool QuestAccept_npc_paoka_swiftmountain(Player* pPlayer, Creature* pCreature, c #define GOSSIP_P "Please tell me the Phrase.." -enum +enum ePlucky { FACTION_FRIENDLY = 35, QUEST_SCOOP = 1950, diff --git a/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp b/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp index ee8f1b29615..eac657fd727 100644 --- a/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp +++ b/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp @@ -138,7 +138,7 @@ CreatureAI* GetAI_npc_ame(Creature* pCreature) # npc_ringo ####*/ -enum +enum eRingo { SAY_RIN_START_1 = -1000416, SAY_RIN_START_2 = -1000417, 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 ee03ade365e..77a4b40594e 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 +enum eEnums { TYPE_LORD_COBRAHN = 1, TYPE_LORD_PYTHAS = 2, diff --git a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp index b18c7c61ff6..d734e32d13b 100644 --- a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp +++ b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp @@ -32,7 +32,7 @@ EndContentData */ ## npc_disciple_of_naralex ######*/ -enum +enum eEnums { //say SAY_MAKE_PREPARATIONS = -1043001, diff --git a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp index 4c58babcb2c..9f87ed03d79 100644 --- a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp +++ b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp @@ -38,7 +38,7 @@ EndContentData */ #define GOSSIP_ITEM_GO_ON "Go on." #define GOSSIP_ITEM_TELL_ME "Tell me what's going on out here, Fizzcrank." -enum +enum eFizzcrank { GOSSIP_TEXTID_FIZZCRANK1 = 12456, GOSSIP_TEXTID_FIZZCRANK2 = 12457, @@ -116,7 +116,7 @@ bool GossipSelect_npc_fizzcrank_fullthrottle(Player* pPlayer, Creature* pCreatur #define GOSSIP_ITEM_FREE_FLIGHT "I'd like passage to the Transitus Shield." #define GOSSIP_ITEM_FLIGHT "May I use a drake to fly elsewhere?" -enum +enum eSurristrasz { SPELL_ABMER_TO_COLDARRA = 46064 }; @@ -158,7 +158,7 @@ bool GossipSelect_npc_surristrasz(Player* pPlayer, Creature* pCreature, uint32 u #define GOSSIP_ITEM_TELEPORT "Teleport me to Amber Ledge, please." -enum +enum eTiare { SPELL_TELEPORT_COLDARRA = 50135 }; @@ -184,7 +184,7 @@ bool GossipSelect_npc_tiare(Player* pPlayer, Creature* pCreature, uint32 uiSende ## npc_sinkhole_kill_credit ######*/ -enum +enum eSinkhole { SPELL_SET_CART = 46797, SPELL_EXPLODE_CART = 46799, @@ -330,7 +330,7 @@ CreatureAI* GetAI_npc_khunok_the_behemoth(Creature* pCreature) ## npc_keristrasza ######*/ -enum +enum eKeristrasza { SPELL_TELEPORT_TO_SARAGOSA = 46772 }; @@ -367,7 +367,7 @@ bool GossipSelect_npc_keristrasza(Player* pPlayer, Creature* pCreature, uint32 u #define GOSSIP_ITEM_C_1 "I... I think so..." -enum +enum eCorastrasza { SPELL_SUMMON_WYRMREST_SKYTALON = 61240, SPELL_WYRMREST_SKYTALON_RIDE_PERIODIC = 61244, @@ -410,15 +410,11 @@ bool GossipSelect_npc_corastrasza(Player* pPlayer, Creature* pCreature, uint32 u #define GOSSIP_ITEM_I "<Search corpse for Issliruk's Totem.>" -enum +enum eIruk { - QUEST_SPIRITS_WATCH_OVER_US = 11961, - SPELL_CREATURE_TOTEM_OF_ISSLIRUK = 46816, - GOSSIP_TEXT_I = 12585 - }; bool GossipHello_npc_iruk(Player* pPlayer, Creature* pCreature) diff --git a/src/bindings/scripts/scripts/northrend/dragonblight.cpp b/src/bindings/scripts/scripts/northrend/dragonblight.cpp index 796d689e4aa..31deb88c069 100644 --- a/src/bindings/scripts/scripts/northrend/dragonblight.cpp +++ b/src/bindings/scripts/scripts/northrend/dragonblight.cpp @@ -27,7 +27,7 @@ EndContentData */ #include "precompiled.h" -enum +enum eEnums { QUEST_RETURN_TO_AG_A = 12499, QUEST_RETURN_TO_AG_H = 12500, diff --git a/src/bindings/scripts/scripts/northrend/grizzly_hills.cpp b/src/bindings/scripts/scripts/northrend/grizzly_hills.cpp index ebc4188983a..2d115bcdeb8 100644 --- a/src/bindings/scripts/scripts/northrend/grizzly_hills.cpp +++ b/src/bindings/scripts/scripts/northrend/grizzly_hills.cpp @@ -33,7 +33,7 @@ EndContentData */ #define GOSSIP_ITEM4 "Who was this stranger?" #define GOSSIP_ITEM5 "Thank you, Kodian. I'll do what I can." -enum +enum eEnums { GOSSIP_TEXTID_ORSONN1 = 12793, GOSSIP_TEXTID_ORSONN2 = 12794, diff --git a/src/bindings/scripts/scripts/northrend/howling_fjord.cpp b/src/bindings/scripts/scripts/northrend/howling_fjord.cpp index cb914730dcb..d6c2189babe 100644 --- a/src/bindings/scripts/scripts/northrend/howling_fjord.cpp +++ b/src/bindings/scripts/scripts/northrend/howling_fjord.cpp @@ -149,7 +149,7 @@ CreatureAI* GetAI_npc_apothecary_hanes(Creature* pCreature) ## npc_plaguehound_tracker ######*/ -enum +enum ePlaguehound { QUEST_SNIFF_OUT_ENEMY = 11253 }; @@ -211,7 +211,7 @@ CreatureAI* GetAI_npc_plaguehound_tracker(Creature* pCreature) #define GOSSIP_RAZAEL_REPORT "High Executor Anselm wants a report on the situation." #define GOSSIP_LYANA_REPORT "High Executor Anselm requests your report." -enum +enum eRazael { QUEST_REPORTS_FROM_THE_FIELD = 11221, NPC_RAZAEL = 23998, diff --git a/src/bindings/scripts/scripts/northrend/icecrown.cpp b/src/bindings/scripts/scripts/northrend/icecrown.cpp index 971cb454085..443b6603943 100644 --- a/src/bindings/scripts/scripts/northrend/icecrown.cpp +++ b/src/bindings/scripts/scripts/northrend/icecrown.cpp @@ -39,7 +39,7 @@ EndContentData */ #define GOSSIP_ARETE_ITEM6 "Let's finish this!" #define GOSSIP_ARETE_ITEM7 "That's quite a tale, Lord-Commander." -enum +enum eArete { GOSSIP_TEXTID_ARETE1 = 13525, GOSSIP_TEXTID_ARETE2 = 13526, diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp index 184d608193c..189eac62ca8 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp @@ -57,7 +57,7 @@ const MinionData minionData[] = {0, 0,} }; -enum +enum eEnums { GO_HORSEMEN_CHEST_HERO = 193426, GO_HORSEMEN_CHEST = 181366, //four horsemen event, DoRespawnGameObject() when event == DONE diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp index b517a23acb4..f0759804235 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp @@ -26,7 +26,7 @@ EndScriptData */ bool DeadChaoticRift; // needed for achievement: Chaos Theory(2037) -enum +enum eEnums { ACHIEVEMENT_CHAOS_THEORY = 2037, diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp index 4d13a6ec283..4845119a89e 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_nexus.h" -enum +enum eEnums { CONTAINMENT_SPHERES = 3, diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp index 45d23c1627f..97ae9a03fa5 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_nexus.h" -enum +enum eEnums { //Spells SPELL_ICE_NOVA_N = 47772, diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp index 59081c806f7..44c4a16401d 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_ormorok.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_nexus.h" -enum +enum eEnums { //Spells SPELL_CRYSTAL_SPIKES_N = 47958, //Don't work, using walkaround 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 678e44e5bbe..411d0cf5f15 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 +enum eEnums { 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 461834a2386..07ccee91a9a 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 +enum eEnums { TYPE_SARTHARION_EVENT = 1, diff --git a/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp b/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp index 582caec864c..0a4421683a3 100644 --- a/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp +++ b/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp @@ -37,7 +37,7 @@ EndContentData */ #define GOSSIP_ITEM1 "I am ready to travel to your village now." -enum +enum eRainspeaker { SAY_START_IRO = -1571000, SAY_QUEST_ACCEPT_IRO = -1571001, @@ -168,7 +168,7 @@ CreatureAI* GetAI_npc_injured_rainspeaker_oracle(Creature* pCreature) #define GOSSIP_VEKJIK_ITEM1 "Shaman Vekjik, I have spoken with the big-tongues and they desire peace. I have brought this offering on their behalf." #define GOSSIP_VEKJIK_ITEM2 "No no... I had no intentions of betraying your people. I was only defending myself. it was all a misunderstanding." -enum +enum eVekjik { GOSSIP_TEXTID_VEKJIK1 = 13137, GOSSIP_TEXTID_VEKJIK2 = 13138, @@ -224,7 +224,7 @@ bool GossipSelect_npc_vekjik(Player* pPlayer, Creature* pCreature, uint32 uiSend #define GOSSIP_ITEM_AOF2 "You can trust me. I am no friend of the Lich King." #define GOSSIP_ITEM_AOF3 "I will not fail." -enum +enum eFreya { QUEST_FREYA_PACT = 12621, diff --git a/src/bindings/scripts/scripts/northrend/storm_peaks.cpp b/src/bindings/scripts/scripts/northrend/storm_peaks.cpp index fcb76b7fbd0..473fca5aa71 100644 --- a/src/bindings/scripts/scripts/northrend/storm_peaks.cpp +++ b/src/bindings/scripts/scripts/northrend/storm_peaks.cpp @@ -24,7 +24,7 @@ #define SAY_AGGRO -1571003 #define GOSSIP_AGNETTA "Skip the warmup, sister... or are you too scared to face soemeone your own size?" -enum +enum eAgnetta { QUEST_ITS_THAT_YOUR_GOBLIN = 12969, FACTION_HOSTILE_AT1 = 45 @@ -76,7 +76,7 @@ bool GossipSelect_npc_agnetta_tyrsdottar(Player* pPlayer, Creature* pCreature, u #define GOSSIP_ITEM2 "I'm sorry that I didn't get here sooner. What happened?" #define GOSSIP_ITEM3 "I'll go get some help. Hang in there." -enum +enum eFrostbornScout { QUEST_MISSING_SCOUTS = 12864 }; @@ -124,7 +124,7 @@ bool GossipSelect_npc_frostborn_scout(Player* pPlayer, Creature* pCreature, uint #define GOSSIP_SN2 "He did more than that, Thorim. He controls Ulduar now." #define GOSSIP_SN3 "It needn't end this way." -enum +enum eThorim { QUEST_SIBLING_RIVALRY = 13064, NPC_THORIM = 29445, 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 8790274e599..39a8e5fcc5d 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 +enum eEnums { MAX_ENCOUNTER = 4, diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp index 09816fcfb57..df03ff9eff7 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp @@ -64,7 +64,7 @@ EndScriptData */ -enum +enum eEnums { EVENT_ENRAGE, // Steelbreaker diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp index cc80d01878d..86523ef0bf6 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp @@ -26,7 +26,7 @@ EndScriptData */ #include "precompiled.h" #include "def_utgarde_keep.h" -enum +enum eEnums { //Yells Ingvar YELL_AGGRO_1 = -1574005, @@ -277,7 +277,7 @@ CreatureAI* GetAI_boss_ingvar_the_plunderer(Creature* pCreature) return new boss_ingvar_the_plundererAI (pCreature); } -enum +enum eSpells { //we don't have that text in db so comment it until we get this text // YELL_RESSURECT = -1574025, @@ -389,7 +389,7 @@ CreatureAI* GetAI_mob_annhylde_the_caller(Creature* pCreature) return new mob_annhylde_the_callerAI (pCreature); } -enum +enum eShadowAxe { SPELL_SHADOW_AXE_DAMAGE = 42750, H_SPELL_SHADOW_AXE_DAMAGE = 59719 diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp index a53b73be910..bff13c8b4cc 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp @@ -26,7 +26,7 @@ EndScriptData */ #include "precompiled.h" #include "def_utgarde_keep.h" -enum +enum eEnums { ACHIEVEMENT_ON_THE_ROCKS = 1919, diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp index bd9a34030ef..0770f9209e9 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp @@ -26,7 +26,7 @@ EndScriptData */ #include "precompiled.h" #include "def_utgarde_keep.h" -enum +enum eEnums { //signed for 24200, but used by 24200,27390 YELL_SKARVALD_AGGRO = -1574011, diff --git a/src/bindings/scripts/scripts/northrend/zuldrak.cpp b/src/bindings/scripts/scripts/northrend/zuldrak.cpp index dde172478d8..90a047b4c44 100644 --- a/src/bindings/scripts/scripts/northrend/zuldrak.cpp +++ b/src/bindings/scripts/scripts/northrend/zuldrak.cpp @@ -22,7 +22,7 @@ ## npc_drakuru_shackles ####*/ -enum +enum eDrakuruShackles { SPELL_LEFT_CHAIN = 59951, SPELL_RIGHT_CHAIN = 59952, @@ -97,7 +97,7 @@ CreatureAI* GetAI_npc_drakuru_shackles(Creature* pCreature) ## npc_captured_rageclaw ####*/ -enum +enum eRageclaw { SPELL_UNSHACKLED = 55085, SPELL_KNEEL = 39656 @@ -174,7 +174,7 @@ CreatureAI* GetAI_npc_captured_rageclaw(Creature* pCreature) #define GOSSIP_ITEM_G "I'm ready, Gymer. Let's go!" -enum +enum eGymer { QUEST_STORM_KING_VENGEANCE = 12919, SPELL_GYMER = 55568 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 32b48cdb8b4..4bfb67b6b9f 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 @@ -206,7 +206,7 @@ CreatureAI* GetAI_boss_nexusprince_shaffar(Creature* pCreature) return new boss_nexusprince_shaffarAI (pCreature); } -enum +enum eEnums { SPELL_ARCANE_BOLT = 15254, SPELL_ETHEREAL_APPRENTICE = 32372 // Summon 18430 @@ -293,7 +293,7 @@ CreatureAI* GetAI_mob_ethereal_beacon(Creature* pCreature) return new mob_ethereal_beaconAI (pCreature); } -enum +enum eEnums { 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 6156f354d84..a0c329bbe1b 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 +enum eEnums { DATA_IKISSDOOREVENT = 1, TYPE_ANZU_ENCOUNTER = 2, diff --git a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp index 830e8b2afc5..942325bd315 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_sethekk_halls.h" -enum +enum eEnums { NPC_ANZU = 23035, IKISS_DOOR = 177203, diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp index e41229ae5e4..0d7e2a7e61d 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp @@ -24,7 +24,7 @@ EndScriptData */ #include "precompiled.h" #include "def_black_temple.h" -enum +enum eEnums { SAY_AGGRO = -1564000, SAY_NEEDLE1 = -1564001, 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 c98c0b1c363..8fddcc44074 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 +enum eEnums { DATA_AKAMA = 1, DATA_AKAMA_SHADE = 2, diff --git a/src/bindings/scripts/scripts/outland/blades_edge_mountains.cpp b/src/bindings/scripts/scripts/outland/blades_edge_mountains.cpp index 5de51ee5d8b..4c8d148d565 100644 --- a/src/bindings/scripts/scripts/outland/blades_edge_mountains.cpp +++ b/src/bindings/scripts/scripts/outland/blades_edge_mountains.cpp @@ -69,7 +69,7 @@ CreatureAI* GetAI_mobs_bladespire_ogre(Creature* pCreature) ## mobs_nether_drake ######*/ -enum +enum eNetherdrake { SAY_NIHIL_1 = -1000396, //signed for 5955 SAY_NIHIL_2 = -1000397, //signed for 5955 @@ -242,7 +242,7 @@ CreatureAI* GetAI_mobs_nether_drake(Creature* pCreature) ## npc_daranelle ######*/ -enum +enum eDaranelle { SAY_SPELL_INFLUENCE = -1000174, SPELL_LASHHAN_CHANNEL = 36904 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 ae7d4b728bd..726af0203ff 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 @@ -264,7 +264,7 @@ CreatureAI* GetAI_boss_kelidan_the_breaker(Creature* pCreature) ## mob_shadowmoon_channeler ######*/ -enum +enum eEnums { SPELL_SHADOW_BOLT = 12739, H_SPELL_SHADOW_BOLT = 15472, diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h index 4adf140b0ca..3c453949baa 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h @@ -7,7 +7,7 @@ #define MAX_ENCOUNTER 2 -enum +enum eEnums { TYPE_VAZRUDEN = 1, TYPE_NAZAN = 2 diff --git a/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp b/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp index 30627bfbfb9..fe0a52e2c47 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp @@ -38,7 +38,7 @@ EndContentData */ ## npc_aeranas ######*/ -enum +enum eAeranas { SAY_SUMMON = -1000138, SAY_FREE = -1000139, @@ -122,7 +122,7 @@ CreatureAI* GetAI_npc_aeranas(Creature* pCreature) ## npc_ancestral_wolf ######*/ -enum +enum eAncestralWolf { EMOTE_WOLF_LIFT_HEAD = -1000496, EMOTE_WOLF_HOWL = -1000497, @@ -201,7 +201,7 @@ bool GOHello_go_haaleshi_altar(Player* pPlayer, GameObject* pGo) #define GOSSIP_NALADU_ITEM1 "Why don't you escape?" -enum +enum eNaladu { GOSSIP_TEXTID_NALADU1 = 9788 }; @@ -232,7 +232,7 @@ bool GossipSelect_npc_naladu(Player* pPlayer, Creature* pCreature, uint32 uiSend #define GOSSIP_TRACY_PROUDWELL_ITEM1 "I heard that your dog Fei Fei took Klatu's prayer beads..." #define GOSSIP_TRACY_PROUDWELL_ITEM2 "<back>" -enum +enum eTracy { GOSSIP_TEXTID_TRACY_PROUDWELL1 = 10689, QUEST_DIGGING_FOR_PRAYER_BEADS = 10916 @@ -280,7 +280,7 @@ bool GossipSelect_npc_tracy_proudwell(Player* pPlayer, Creature* pCreature, uint #define GOSSIP_TROLLBANE_ITEM2 "<more>" #define GOSSIP_TROLLBANE_ITEM3 "Tell me of your homeland." -enum +enum eTrollbane { GOSSIP_TEXTID_TROLLBANE1 = 9932, GOSSIP_TEXTID_TROLLBANE2 = 9933, @@ -321,7 +321,7 @@ bool GossipSelect_npc_trollbane(Player* pPlayer, Creature* pCreature, uint32 uiS ## npc_wounded_blood_elf ######*/ -enum +enum eWoundedBloodElf { SAY_ELF_START = -1000117, SAY_ELF_SUMMON1 = -1000118, diff --git a/src/bindings/scripts/scripts/outland/nagrand.cpp b/src/bindings/scripts/scripts/outland/nagrand.cpp index 1b0f95c0411..839c632a0eb 100644 --- a/src/bindings/scripts/scripts/outland/nagrand.cpp +++ b/src/bindings/scripts/scripts/outland/nagrand.cpp @@ -523,7 +523,7 @@ bool GossipSelect_npc_lantresor_of_the_blade(Player* pPlayer, Creature* pCreatur ## npc_maghar_captive #####*/ -enum +enum eMagharCaptive { SAY_MAG_START = -1000482, SAY_MAG_NO_ESCAPE = -1000483, diff --git a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp index 1816159cd6f..602a09fa76a 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 +enum eEnums { SAY_JUST_EATEN = -1000222, @@ -623,7 +623,7 @@ bool GossipSelect_npc_oronok_tornheart(Player* pPlayer, Creature* pCreature, uin # npc_karynaku ####*/ -enum +enum eEnums { QUEST_ALLY_OF_NETHER = 10870, diff --git a/src/bindings/scripts/scripts/outland/shattrath_city.cpp b/src/bindings/scripts/scripts/outland/shattrath_city.cpp index 600767690d1..cd25653fc61 100644 --- a/src/bindings/scripts/scripts/outland/shattrath_city.cpp +++ b/src/bindings/scripts/scripts/outland/shattrath_city.cpp @@ -41,7 +41,7 @@ EndContentData */ #define GOSSIP_RALIQ "You owe Sim'salabim money. Hand them over or die!" -enum +enum eRaliq { SPELL_UPPERCUT = 10966, QUEST_CRACK_SKULLS = 10009, diff --git a/src/bindings/scripts/scripts/outland/terokkar_forest.cpp b/src/bindings/scripts/scripts/outland/terokkar_forest.cpp index aae3a62ea49..76776234d98 100644 --- a/src/bindings/scripts/scripts/outland/terokkar_forest.cpp +++ b/src/bindings/scripts/scripts/outland/terokkar_forest.cpp @@ -301,7 +301,7 @@ CreatureAI* GetAI_mob_netherweb_victim(Creature* pCreature) #define GOSSIP_FLOON1 "You owe Sim'salabim money. Hand them over or die!" #define GOSSIP_FLOON2 "Hand over the money or die...again!" -enum +enum eFloon { SAY_FLOON_ATTACK = -1000352, @@ -531,7 +531,7 @@ bool GossipSelect_go_skull_pile(Player* pPlayer, GameObject* pGo, uint32 uiSende ## npc_slim ######*/ -enum +enum eSlim { FACTION_CONSORTIUM = 933 }; diff --git a/src/bindings/scripts/scripts/outland/zangarmarsh.cpp b/src/bindings/scripts/scripts/outland/zangarmarsh.cpp index 3ab9468a77e..d03e161a2c5 100644 --- a/src/bindings/scripts/scripts/outland/zangarmarsh.cpp +++ b/src/bindings/scripts/scripts/outland/zangarmarsh.cpp @@ -122,7 +122,7 @@ bool GossipSelect_npcs_ashyen_and_keleth(Player* pPlayer, Creature* pCreature, u #define GOSSIP_COOSH "You owe Sim'salabim money. Hand them over or die!" -enum +enum eCooshhooosh { SPELL_LIGHTNING_BOLT = 9532, QUEST_CRACK_SKULLS = 10009, @@ -265,7 +265,7 @@ bool GossipSelect_npc_mortog_steamhead(Player* pPlayer, Creature* pCreature, uin ## npc_kayra_longmane ######*/ -enum +enum eKayra { SAY_START = -1000360, SAY_AMBUSH1 = -1000361, @@ -343,7 +343,7 @@ CreatureAI* GetAI_npc_kayra_longmaneAI(Creature* pCreature) #define GOSSIP_TIMOTHY_DANIELS_ITEM1 "Specialist, eh? Just what kind of specialist are you, anyway?" #define GOSSIP_TEXT_BROWSE_POISONS "Let me browse your reagents and poison supplies." -enum +enum eTimothy { GOSSIP_TEXTID_TIMOTHY_DANIELS1 = 9239 }; diff --git a/src/bindings/scripts/scripts/world/areatrigger_scripts.cpp b/src/bindings/scripts/scripts/world/areatrigger_scripts.cpp index 9ed608ce97b..5aa7ecb7f04 100644 --- a/src/bindings/scripts/scripts/world/areatrigger_scripts.cpp +++ b/src/bindings/scripts/scripts/world/areatrigger_scripts.cpp @@ -31,7 +31,7 @@ EndContentData */ ## at_legion_teleporter #####*/ -enum +enum eLegionTeleporter { SPELL_TELE_A_TO = 37387, QUEST_GAINING_ACCESS_A = 10589, @@ -61,7 +61,7 @@ bool AreaTrigger_at_legion_teleporter(Player* pPlayer, AreaTriggerEntry* pAt) return false; } -enum +enum eRavenholdt { QUEST_MANOR_RAVENHOLDT = 6681, NPC_RAVENHOLDT = 13936 diff --git a/src/bindings/scripts/scripts/world/boss_emeriss.cpp b/src/bindings/scripts/scripts/world/boss_emeriss.cpp index 21e822aec52..fa53ed89d21 100644 --- a/src/bindings/scripts/scripts/world/boss_emeriss.cpp +++ b/src/bindings/scripts/scripts/world/boss_emeriss.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" -enum +enum eEnums { SAY_AGGRO = -1000401, SAY_CASTCORRUPTION = -1000402, //signed for 6182 diff --git a/src/bindings/scripts/scripts/world/boss_taerar.cpp b/src/bindings/scripts/scripts/world/boss_taerar.cpp index edc34b1c130..6659924c41b 100644 --- a/src/bindings/scripts/scripts/world/boss_taerar.cpp +++ b/src/bindings/scripts/scripts/world/boss_taerar.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" -enum +enum eEnums { SAY_AGGRO = -1000399, //signed for 20021 SAY_SUMMONSHADE = -1000400, //signed for 20021 diff --git a/src/bindings/scripts/scripts/world/boss_ysondre.cpp b/src/bindings/scripts/scripts/world/boss_ysondre.cpp index 93b1c0c4c41..2f3948d38d9 100644 --- a/src/bindings/scripts/scripts/world/boss_ysondre.cpp +++ b/src/bindings/scripts/scripts/world/boss_ysondre.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "precompiled.h" -enum +enum eEnums { SAY_AGGRO = -1000360, //signed for 17969 SAY_SUMMONDRUIDS = -1000361, //signed for 17969 diff --git a/src/bindings/scripts/scripts/world/go_scripts.cpp b/src/bindings/scripts/scripts/world/go_scripts.cpp index cfab04b5f69..fd77f0f6331 100644 --- a/src/bindings/scripts/scripts/world/go_scripts.cpp +++ b/src/bindings/scripts/scripts/world/go_scripts.cpp @@ -47,7 +47,7 @@ EndContentData */ ## go_cat_figurine ######*/ -enum +enum eCatFigurine { SPELL_SUMMON_GHOST_SABER = 5968, }; @@ -134,7 +134,7 @@ bool GOHello_go_field_repair_bot_74A(Player* pPlayer, GameObject* pGo) ## go_gilded_brazier ######*/ -enum +enum eGildedBrazier { NPC_STILLBLADE = 17716, }; @@ -142,10 +142,8 @@ enum bool GOHello_go_gilded_brazier(Player* pPlayer, GameObject* pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) - { if (Creature* pCreature = pPlayer->SummonCreature(NPC_STILLBLADE, 8087.632, -7542.740, 151.568, 0.122, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000)) pCreature->AI()->AttackStart(pPlayer); - } return true; } @@ -207,7 +205,7 @@ bool GOHello_go_jump_a_tron(Player* pPlayer, GameObject* pGo) ## go_ethereum_prison ######*/ -enum +enum eEthereumPrison { SPELL_REP_LC = 39456, SPELL_REP_SHAT = 39457, @@ -282,7 +280,7 @@ bool GOHello_go_ethereum_stasis(Player* pPlayer, GameObject* pGo) ## go_resonite_cask ######*/ -enum +enum eResoniteCask { NPC_GOGGEROC = 11920 }; @@ -313,7 +311,7 @@ bool GOHello_go_sacred_fire_of_life(Player* pPlayer, GameObject* pGO) ## go_shrine_of_the_birds ######*/ -enum +enum eShrineOfTheBirds { NPC_HAWK_GUARD = 22992, NPC_EAGLE_GUARD = 22993, @@ -353,7 +351,7 @@ bool GOHello_go_shrine_of_the_birds(Player* pPlayer, GameObject* pGo) ## go_southfury_moonstone ######*/ -enum +enum eSouthfury { NPC_RIZZLE = 23002, SPELL_BLACKJACK = 39865, //stuns player @@ -376,7 +374,7 @@ bool GOHello_go_southfury_moonstone(Player* pPlayer, GameObject* pGo) ## go_tele_to_dalaran_crystal ######*/ -enum +enum eDalaranCrystal { QUEST_LEARN_LEAVE_RETURN = 12790, QUEST_TELE_CRYSTAL_FLAG = 12845 @@ -413,7 +411,7 @@ bool GOHello_go_tele_to_violet_stand(Player* pPlayer, GameObject* pGo) #define GOSSIP_FEL_CRYSTALFORGE_ITEM_5 "Purchase 5 Unstable Flask of the Beast for the cost of 50 Apexis Shards" #define GOSSIP_FEL_CRYSTALFORGE_ITEM_RETURN "Use the fel crystalforge to make another purchase." -enum +enum eFelCrystalforge { SPELL_CREATE_1_FLASK_OF_BEAST = 40964, SPELL_CREATE_5_FLASK_OF_BEAST = 40965, @@ -459,7 +457,7 @@ bool GOSelect_go_fel_crystalforge(Player* pPlayer, GameObject* pGO, uint32 uiSen ## go_bashir_crystalforge ######*/ -enum +enum eBashirCrystalforge { SPELL_CREATE_1_FLASK_OF_SORCERER = 40968, SPELL_CREATE_5_FLASK_OF_SORCERER = 40970, @@ -483,7 +481,7 @@ bool GOHello_go_wg2voa_portal(Player* pPlayer, GameObject* pGO) ## matrix_punchograph ######*/ -enum +enum eMatrixPunchograph { ITEM_WHITE_PUNCH_CARD = 9279, ITEM_YELLOW_PUNCH_CARD = 9280, diff --git a/src/bindings/scripts/scripts/world/item_scripts.cpp b/src/bindings/scripts/scripts/world/item_scripts.cpp index cab35903b7d..0e0f5795be9 100644 --- a/src/bindings/scripts/scripts/world/item_scripts.cpp +++ b/src/bindings/scripts/scripts/world/item_scripts.cpp @@ -36,7 +36,7 @@ EndContentData */ # item_only_for_flight #####*/ -enum +enum eOnlyForFlight { SPELL_ARCANE_CHARGES = 45072 }; diff --git a/src/bindings/scripts/scripts/world/npc_professions.cpp b/src/bindings/scripts/scripts/world/npc_professions.cpp index 06c485b02a3..484339c59bb 100644 --- a/src/bindings/scripts/scripts/world/npc_professions.cpp +++ b/src/bindings/scripts/scripts/world/npc_professions.cpp @@ -815,7 +815,7 @@ bool GossipSelect_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint # engineering trinkets ###*/ -enum +enum eEngineeringTrinkets { NPC_ZAP = 14742, NPC_JHORDY = 14743, diff --git a/src/bindings/scripts/scripts/world/npcs_special.cpp b/src/bindings/scripts/scripts/world/npcs_special.cpp index 415a726eb1a..ce1d73caf5e 100644 --- a/src/bindings/scripts/scripts/world/npcs_special.cpp +++ b/src/bindings/scripts/scripts/world/npcs_special.cpp @@ -58,7 +58,7 @@ struct SpawnAssociation SpawnType m_SpawnType; }; -enum +enum eEnums { SPELL_GUARDS_MARK = 38067, AURA_DURATION_TIME_LEFT = 5000 @@ -794,7 +794,7 @@ CreatureAI* GetAI_npc_doctor(Creature* pCreature) //TODO: get text for each NPC -enum +enum eGarments { SPELL_LESSER_HEAL_R2 = 2052, SPELL_FORTITUDE_R1 = 1243, @@ -1042,7 +1042,7 @@ CreatureAI* GetAI_npc_guardian(Creature* pCreature) ## npc_kingdom_of_dalaran_quests ######*/ -enum +enum eKingdomDalaran { SPELL_TELEPORT_DALARAN = 53360, ITEM_KT_SIGNET = 39740, |