*Anonymous enum elimination!

--HG--
branch : trunk

7 files changed, 12 insertions, 12 deletions

diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/silverpine_forest.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/silverpine_forest.cpp
index 5f547d91676..694eeb3f22d 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/silverpine_forest.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/silverpine_forest.cpp
@@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL npc_deathstalker_erlandAI : public npc_escortAI
 
     void EnterCombat(Unit* who)
     {
-        DoScriptText(RAND(SAY_AGGRO_1, m_creature,SAY_AGGRO_2, m_creature), who);
+        DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), m_creature, who);
     }
 };
 
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/westfall.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/westfall.cpp
index 6cbcb1f0213..6a1df820efa 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/westfall.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/westfall.cpp
@@ -33,7 +33,7 @@ EndContentData */
 ## npc_daphne_stilwell
 ######*/
 
-enum
+enum eEnums
 {
     SAY_DS_START        = -1000402,
     SAY_DS_DOWN_1       = -1000403,
@@ -221,7 +221,7 @@ struct TRINITY_DLL_DECL npc_defias_traitorAI : public npc_escortAI
     }
     void EnterCombat(Unit* who)
     {
-        DoScriptText(RAND(SAY_AGGRO_1, m_creature,SAY_AGGRO_2, m_creature), who);
+        DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), m_creature, who);
     }
 
     void Reset() {}
diff --git a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp
index c7559e703f9..313b34f4a70 100644
--- a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp
@@ -38,7 +38,7 @@ EndContentData */
 ## npc_draenei_survivor
 ######*/
 
-enum
+enum eEnums
 {
     SAY_HEAL1           = -1000248,
     SAY_HEAL2           = -1000249,
@@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI
         if (CanSayHelp && who->GetTypeId() == TYPEID_PLAYER && m_creature->IsFriendlyTo(who) && m_creature->IsWithinDistInMap(who, 25.0f))
         {
             //Random switch between 4 texts
-            DoScriptText(RAND(SAY_HELP1, m_creature,SAY_HELP2, m_creature,SAY_HELP3, m_creature,SAY_HELP4, m_creature), who);
+            DoScriptText(RAND(SAY_HELP1, SAY_HELP2, SAY_HELP3, SAY_HELP4), m_creature, who);
 
             SayHelpTimer = 20000;
             CanSayHelp = false;
@@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI
 
                 if (Player* pPlayer = Unit::GetPlayer(pCaster))
                 {
-                    DoScriptText(RAND(SAY_HEAL1, m_creature,SAY_HEAL2, m_creature,SAY_HEAL3, m_creature,SAY_HEAL4, m_creature), pPlayer);
+                    DoScriptText(RAND(SAY_HEAL1, SAY_HEAL2, SAY_HEAL3, SAY_HEAL4), m_creature, pPlayer);
 
                     pPlayer->TalkedToCreature(m_creature->GetEntry(),m_creature->GetGUID());
                 }
diff --git a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp
index aecf7ef8221..543b7e21c5f 100644
--- a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp
@@ -433,7 +433,7 @@ CreatureAI* GetAI_npc_OOX17(Creature* pCreature)
 # npc_tooga
 ####*/
 
-enum
+enum eEnums
 {
     SAY_TOOG_THIRST             = -1000391,
     SAY_TOOG_WORRIED            = -1000392,
diff --git a/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp b/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp
index 278e639f700..8d0a078755a 100644
--- a/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp
@@ -67,7 +67,7 @@ bool GossipSelect_npc_beaten_corpse(Player* pPlayer, Creature* pCreature, uint32
 # npc_gilthares
 ######*/
 
-enum
+enum eEnums
 {
     SAY_GIL_START               = -1000370,
     SAY_GIL_AT_LAST             = -1000371,
@@ -133,7 +133,7 @@ struct TRINITY_DLL_DECL npc_giltharesAI : public npc_escortAI
         if (pWho->GetTypeId() != TYPEID_PLAYER && m_creature->GetAreaId() == AREA_MERCHANT_COAST)
         {
             //appears to be pretty much random (possible only if escorter not in combat with pWho yet?)
-            DoScriptText(RAND(SAY_GIL_AGGRO_1, m_creature,SAY_GIL_AGGRO_2, m_creature,SAY_GIL_AGGRO_3, m_creature,SAY_GIL_AGGRO_4, m_creature), pWho);
+            DoScriptText(RAND(SAY_GIL_AGGRO_1, SAY_GIL_AGGRO_2, SAY_GIL_AGGRO_3, SAY_GIL_AGGRO_4), m_creature, pWho);
         }
     }
 };
diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp
index 0a6d5383479..44803029804 100644
--- a/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/violet_hold.cpp
@@ -97,4 +97,4 @@ void AddSC_violet_hold()
     newscript->Name = "npc_teleportation_portal_vh";
     newscript->GetAI = &GetAI_npc_teleportation_portal;
     newscript->RegisterSelf();
-}
\ No newline at end of file
+}
diff --git a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp
index db0b5fd09d0..1816159cd6f 100644
--- a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp
+++ b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp
@@ -852,7 +852,7 @@ bool QuestAccept_npc_overlord_morghor(Player* pPlayer, Creature* pCreature, cons
 # npc_earthmender_wilda
 ####*/
 
-enum
+enum eEnums
 {
     SAY_WIL_START               = -1000381,
     SAY_WIL_AGGRO1              = -1000382,
@@ -976,7 +976,7 @@ struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI
         {
             //appears to be random
             if (urand(0,1))
-                DoScriptText(RAND(SAY_WIL_AGGRO1, m_creature,SAY_WIL_AGGRO2, m_creature), pWho);
+                DoScriptText(RAND(SAY_WIL_AGGRO1, SAY_WIL_AGGRO2), pWho);
         }
     }