Scripted/Misc: Some cleanup

3 files changed, 22 insertions, 13 deletions

diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp
index 78c66750c5c..ae4980c2d75 100644
--- a/src/server/scripts/Examples/example_creature.cpp
+++ b/src/server/scripts/Examples/example_creature.cpp
@@ -72,7 +72,7 @@ enum Spells
     SPELL_BERSERK                               = 32965,
 };
 
-enum eEnums
+enum Factions
 {
     // any other constants
     FACTION_WORGEN                              = 24
diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp
index f4cb5c24e18..5d0f2321402 100644
--- a/src/server/scripts/Examples/example_escort.cpp
+++ b/src/server/scripts/Examples/example_escort.cpp
@@ -30,14 +30,8 @@ EndScriptData */
 #include "Player.h"
 #include "CreatureTextMgr.h"
 
-enum eEnums
+enum Yells
 {
-    NPC_FELBOAR                 = 21878,
-
-    SPELL_DEATH_COIL            = 33130,
-    SPELL_ELIXIR_OF_FORTITUDE   = 3593,
-    SPELL_BLUE_FIREWORK         = 11540,
-
     SAY_AGGRO1                  = 0,
     SAY_AGGRO2                  = 1,
     SAY_WP_1                    = 2,
@@ -52,6 +46,18 @@ enum eEnums
     SAY_RAND_2                  = 11
 };
 
+enum Spells
+{
+    SPELL_DEATH_COIL            = 33130,
+    SPELL_ELIXIR_OF_FORTITUDE   = 3593,
+    SPELL_BLUE_FIREWORK         = 11540
+};
+
+enum Creatures
+{
+    NPC_FELBOAR                 = 21878
+};
+
 #define GOSSIP_ITEM_1   "Click to Test Escort(Attack, Run)"
 #define GOSSIP_ITEM_2   "Click to Test Escort(NoAttack, Walk)"
 #define GOSSIP_ITEM_3   "Click to Test Escort(NoAttack, Run)"
diff --git a/src/server/scripts/Examples/example_gossip_codebox.cpp b/src/server/scripts/Examples/example_gossip_codebox.cpp
index 1cfc1ef23ae..432e7e74c35 100644
--- a/src/server/scripts/Examples/example_gossip_codebox.cpp
+++ b/src/server/scripts/Examples/example_gossip_codebox.cpp
@@ -29,17 +29,20 @@ EndScriptData */
 #include "Player.h"
 #include <cstring>
 
-enum eEnums
+enum Yells
 {
-    SPELL_POLYMORPH         = 12826,
-    SPELL_MARK_OF_THE_WILD  = 26990,
-
-    //These texts must be added to the creature texts of the npc for which the script is assigned.
+    // These texts must be added to the creature texts of the npc for which the script is assigned.
     SAY_NOT_INTERESTED      = 0, // "Normal select, guess you're not interested."
     SAY_WRONG               = 1, // "Wrong!"
     SAY_CORRECT             = 2  // "You're right, you are allowed to see my inner secrets."
 };
 
+enum Spells
+{
+    SPELL_POLYMORPH         = 12826,
+    SPELL_MARK_OF_THE_WILD  = 26990
+};
+
 #define GOSSIP_ITEM_1       "A quiz: what's your name?"
 #define GOSSIP_ITEM_2       "I'm not interested"