*Anonymous enum elimination, part 3

--HG-- branch : trunk
2009-10-17 07:42:48 -07:00
parent 5441f8d5de
commit 50793d96f3
107 changed files with 174 additions and 180 deletions
@@ -12,7 +12,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "escort_ai.h"
-enum
+enum ePoints
 {
    POINT_LAST_POINT    = 0xFFFFFF,
    POINT_HOME          = 0xFFFFFE
@@ -14,7 +14,7 @@ EndScriptData */
 const float MAX_PLAYER_DISTANCE = 100.0f;
-enum
+enum ePoints
 {
    POINT_COMBAT_START  = 0xFFFFFF
 };
@@ -531,7 +531,7 @@ void ScriptedAI::SetCombatMovement(bool bCombatMove)
    m_bCombatMovement = bCombatMove;
 }
-enum
+enum eNPCs
 {
    NPC_BROODLORD   = 12017,
    NPC_VOID_REAVER = 19516,
@@ -73,7 +73,7 @@
 #define GOSSIP_TEXT_FISHING             "Fishing"
 #define GOSSIP_TEXT_SKINNING            "Skinning"
-enum
+enum eEnums
 {
 // Skill defines
    TRADESKILL_ALCHEMY                  = 1,
@@ -32,7 +32,7 @@ EndContentData */
 ## npc_professor_phizzlethorpe
 ######*/
-enum
+enum eEnums
 {
    SAY_PROGRESS_1      = -1000235,
    SAY_PROGRESS_2      = -1000236,
@@ -60,7 +60,7 @@ bool GOHello_go_shadowforge_brazier(Player* pPlayer, GameObject* pGo)
 ## npc_grimstone
 ######*/
-enum
+enum eGrimstone
 {
    NPC_GRIMSTONE       = 10096,
    NPC_THELDREN        = 16059,
@@ -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,
@@ -9,7 +9,7 @@
 #define FACTION_HOSTILE             754
 #define FACTION_FRIEND              35
-enum
+enum eEnums
 {
    TYPE_RING_OF_LAW        = 1,
    TYPE_VAULT              = 2,
@@ -34,7 +34,7 @@ update `instance_template` set `script`='instance_blackrock_depths' where `map`=
 #define TIMER_TOMBOFTHESEVEN    15000
-enum
+enum eEnums
 {
    MAX_ENCOUNTER           = 6,
@@ -135,7 +135,7 @@ bool GOHello_gilded_brazier(Player* pPlayer, GameObject* pGo)
 ## npc_ranger_lilatha
 ######*/
-enum
+enum eEnums
 {
    SAY_START           = -1000140,
    SAY_PROGRESS1       = -1000141,
@@ -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,
@@ -6,7 +6,7 @@
 #ifndef DEF_KARAZHAN_H
 #define DEF_KARAZHAN_H
-enum
+enum eEnums
 {
    TYPE_ATTUMEN                    = 1,
    TYPE_MOROES                     = 2,
@@ -393,7 +393,7 @@ bool GossipSelect_npc_barnes(Player* pPlayer, Creature* pCreature, uint32 uiSend
 # npc_berthold
 ####*/
-enum
+enum eBerthold
 {
    SPELL_TELEPORT           = 39567
 };
@@ -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,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_magisters_terrace.h"
-enum
+enum eEnums
 {
    SAY_AGGRO                       = -1585007,
    SAY_ENERGY                      = -1585008,
@@ -31,7 +31,7 @@ EndContentData */
 ## npc_kalecgos
 ######*/
-enum
+enum eEnums
 {
    SPELL_TRANSFORM_TO_KAEL     = 44670,
    SPELL_ORB_KILL_CREDIT       = 46307,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_molten_core.h"
-enum
+enum eEnums
 {
    SPELL_MAGMASPLASH       = 13879,
    SPELL_PYROBLAST         = 20228,
@@ -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,
@@ -23,7 +23,7 @@ EndScriptData */
 #include "precompiled.h"
-enum
+enum eEnums
 {
    SAY_AGGRO                   = -1189019,
    SAY_SPECIALAE               = -1189020,
@@ -23,7 +23,7 @@ EndScriptData */
 #include "precompiled.h"
-enum
+enum eEnums
 {
    SAY_AGGRO               = -1189016,
    SAY_HEALTH              = -1189017,
@@ -23,7 +23,7 @@ EndScriptData */
 #include "precompiled.h"
-enum
+enum eSpells
 {
    SPELL_CURSEOFBLOOD              = 8282,
    SPELL_DISPELMAGIC               = 15090,
@@ -23,7 +23,7 @@ EndScriptData */
 #include "precompiled.h"
-enum
+enum eEnums
 {
    SAY_AGGRO                       = -1189021,
    SPELL_SUMMONSCARLETHOUND        = 17164,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_scarlet_monastery.h"
-enum
+enum eEnums
 {
    SAY_AGGRO               = -1189011,
    SAY_HEALTH1             = -1189012,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_scarlet_monastery.h"
-enum
+enum eEnums
 {
    //Mograine says
    SAY_MO_AGGRO                 = -1189005,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_scholomance.h"
-enum
+enum eEnums
 {
    EMOTE_GENERIC_FRENZY_KILL   = -1000001,
@@ -23,7 +23,7 @@ EndScriptData */
 #include "precompiled.h"
-enum
+enum eEnums
 {
    EMOTE_GENERIC_FRENZY_KILL   = -1000001,
@@ -26,7 +26,7 @@ EndScriptData */
 #define MAX_ENCOUNTER              4
-enum
+enum eEnums
 {
    SAY_BOSS_DIE_AD         = -1033007,
    SAY_BOSS_DIE_AS         = -1033008,
@@ -33,7 +33,7 @@ EndContentData */
 ## npc_shadowfang_prisoner
 ######*/
-enum
+enum eEnums
 {
    SAY_FREE_AS             = -1033000,
    SAY_OPEN_DOOR_AS        = -1033001,
@@ -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,
@@ -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
@@ -23,7 +23,7 @@ EndScriptData */
 #include "precompiled.h"
-enum
+enum eEnums
 {
    //Dathrohan spells
    SPELL_CRUSADERSHAMMER           = 17286,                //AOE stun
@@ -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
@@ -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,
@@ -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,
@@ -33,7 +33,7 @@ EndContentData */
 ## npc_tapoke_slim_jahn
 ######*/
-enum
+enum eTapokeSlim
 {
    QUEST_MISSING_DIPLO_PT11    = 1249,
    FACTION_ENEMY               = 168,
@@ -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,
@@ -5,7 +5,7 @@
 #ifndef DEF_ZULGURUB_H
 #define DEF_ZULGURUB_H
-enum
+enum eEnums
 {
    MAX_ENCOUNTERS          = 8,
@@ -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)
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "escort_ai.h"
-enum
+enum eEnums
 {
    NPC_FELBOAR                 = 21878,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include <cstring>
-enum
+enum eEnums
 {
    SPELL_POLYMORPH         = 12826,
    SPELL_MARK_OF_THE_WILD  = 26990,
@@ -23,7 +23,7 @@ EndScriptData */
 #include "precompiled.h"
-enum
+enum eSay
 {
    SAY_HI  = -1999925
 };
@@ -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,
@@ -5,7 +5,7 @@
 #ifndef DEF_BFD_H
 #define DEF_BFD_H
-enum
+enum eEnums
 {
    DATA_SHRINE1                = 1,
    DATA_SHRINE2                = 2,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_dark_portal.h"
-enum
+enum eEnums
 {
    SAY_ENTER           = -1269012,
    SAY_AGGRO           = -1269013,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_dark_portal.h"
-enum
+enum eEnums
 {
    SAY_ENTER                   = -1269006,
    SAY_AGGRO                   = -1269007,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_dark_portal.h"
-enum
+enum eEnums
 {
    SAY_ENTER               = -1269000,
    SAY_AGGRO               = -1269001,
@@ -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,
@@ -25,7 +25,7 @@ EndScriptData */
 #include "def_hyjal.h"
 #include "hyjal_trash.h"
-enum
+enum eEnums
 {
    MAX_ENCOUNTER       = 5,
@@ -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
@@ -27,7 +27,7 @@ EndContentData */
 #include "precompiled.h"
-enum
+enum eDyingKodo
 {
    // signed for 9999
    SAY_SMEED_HOME_1                = -1000428,
@@ -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
@@ -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,
@@ -36,7 +36,7 @@ EndContentData */
 ## npc_bunthen_plainswind
 ######*/
-enum
+enum eBunthen
 {
    QUEST_SEA_LION_HORDE        = 30,
    QUEST_SEA_LION_ALLY         = 272,
@@ -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,
@@ -69,7 +69,7 @@ bool GossipSelect_npc_neeru_fireblade(Player* pPlayer, Creature* pCreature, uint
 ## npc_shenthul
 ######*/
-enum
+enum eShenthul
 {
    QUEST_SHATTERED_SALUTE  = 2460
 };
@@ -31,7 +31,7 @@ EndContentData */
 # npc_henry_stern
 ####*/
-enum
+enum eEnums
 {
    SPELL_GOLDTHORN_TEA                         = 13028,
    SPELL_TEACHING_GOLDTHORN_TEA                = 13029,
@@ -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,
@@ -80,7 +80,7 @@ bool GossipSelect_npc_braug_dimspirit(Player* pPlayer, Creature* pCreature, uint
 ## npc_kaya_flathoof
 ######*/
-enum
+enum eKaya
 {
    FACTION_ESCORTEE_H          = 775,
@@ -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,
@@ -32,7 +32,7 @@ EndContentData */
 # npc_mist
 ####*/
-enum
+enum eMist
 {
    SAY_AT_HOME             = -1000411,
    EMOTE_AT_HOME           = -1000412,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -32,7 +32,7 @@ EndContentData */
 ## npc_disciple_of_naralex
 ######*/
-enum
+enum eEnums
 {
    //say
    SAY_MAKE_PREPARATIONS         = -1043001,
@@ -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)
@@ -27,7 +27,7 @@ EndContentData */
 #include "precompiled.h"
-enum
+enum eEnums
 {
    QUEST_RETURN_TO_AG_A    = 12499,
    QUEST_RETURN_TO_AG_H    = 12500,
@@ -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,
@@ -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,
@@ -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,
@@ -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
@@ -26,7 +26,7 @@ EndScriptData */
 bool DeadChaoticRift; // needed for achievement: Chaos Theory(2037)
-enum
+enum eEnums
 {
    ACHIEVEMENT_CHAOS_THEORY   = 2037,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_nexus.h"
-enum
+enum eEnums
 {
    CONTAINMENT_SPHERES                             = 3,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_nexus.h"
-enum
+enum eEnums
 {
 //Spells
    SPELL_ICE_NOVA_N          = 47772,
@@ -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
@@ -1,7 +1,7 @@
 #ifndef DEF_NEXUS_H
 #define DEF_NEXUS_H
-enum
+enum eEnums
 {
    DATA_MAGUS_TELESTRA_EVENT,
    DATA_ANOMALUS_EVENT,
@@ -1,7 +1,7 @@
 #ifndef DEF_OBSIDIAN_SANCTUM_H
 #define DEF_OBSIDIAN_SANCTUM_H
-enum
+enum eEnums
 {
    TYPE_SARTHARION_EVENT       = 1,
@@ -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,
@@ -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,
@@ -5,7 +5,7 @@
 #ifndef DEF_HALLS_OF_LIGHTNING_H
 #define DEF_HALLS_OF_LIGHTNING_H
-enum
+enum eEnums
 {
    MAX_ENCOUNTER           = 4,
@@ -64,7 +64,7 @@ EndScriptData */
-enum
+enum eEnums
 {
    EVENT_ENRAGE,
    // Steelbreaker
@@ -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
@@ -26,7 +26,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_utgarde_keep.h"
-enum
+enum eEnums
 {
    ACHIEVEMENT_ON_THE_ROCKS                 = 1919,
@@ -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,
@@ -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
@@ -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
@@ -5,7 +5,7 @@
 #ifndef DEF_SETHEKK_HALLS_H
 #define DEF_SETHEKK_HALLS_H
-enum
+enum eEnums
 {
    DATA_IKISSDOOREVENT = 1,
    TYPE_ANZU_ENCOUNTER = 2,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_sethekk_halls.h"
-enum
+enum eEnums
 {
    NPC_ANZU   = 23035,
    IKISS_DOOR = 177203,
@@ -24,7 +24,7 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_black_temple.h"
-enum
+enum eEnums
 {
    SAY_AGGRO                       = -1564000,
    SAY_NEEDLE1                     = -1564001,
@@ -5,7 +5,7 @@
 #ifndef DEF_BLACK_TEMPLE_H
 #define DEF_BLACK_TEMPLE_H
-enum
+enum eEnums
 {                             
    DATA_AKAMA                      = 1,
    DATA_AKAMA_SHADE                = 2,
@@ -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
@@ -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,
@@ -7,7 +7,7 @@
 #define MAX_ENCOUNTER  2
-enum
+enum eEnums
 {
    TYPE_VAZRUDEN       = 1,
    TYPE_NAZAN          = 2
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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
 };
@@ -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
 };
@@ -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
--- a/Show More
+++ b/Show More