Core/Scripting: Some cleanup

4 files changed, 25 insertions, 16 deletions

diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
index e28abc0fdcc..defe95c70a0 100644
--- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
+++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
@@ -27,18 +27,24 @@ EndScriptData */
 #include "InstanceScript.h"
 #include "sunken_temple.h"
 
-#define GO_ATALAI_STATUE1 148830
-#define GO_ATALAI_STATUE2 148831
-#define GO_ATALAI_STATUE3 148832
-#define GO_ATALAI_STATUE4 148833
-#define GO_ATALAI_STATUE5 148834
-#define GO_ATALAI_STATUE6 148835
-#define GO_ATALAI_IDOL 148836
-
-#define GO_ATALAI_LIGHT1 148883
-#define GO_ATALAI_LIGHT2 148937
-
-#define NPC_MALFURION_STORMRAGE 15362
+enum Gameobject
+{
+    GO_ATALAI_STATUE1           = 148830,
+    GO_ATALAI_STATUE2           = 148831,
+    GO_ATALAI_STATUE3           = 148832,
+    GO_ATALAI_STATUE4           = 148833,
+    GO_ATALAI_STATUE5           = 148834,
+    GO_ATALAI_STATUE6           = 148835,
+    GO_ATALAI_IDOL              = 148836,
+    GO_ATALAI_LIGHT1            = 148883,
+    GO_ATALAI_LIGHT2            = 148937
+
+};
+
+enum Creature
+{
+    NPC_MALFURION_STORMRAGE     = 15362
+};
 
 class instance_sunken_temple : public InstanceMapScript
 {
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
index 79528fa35ba..810ee5e900e 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
@@ -27,8 +27,11 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "zulgurub.h"
 
-#define SPELL_LIGHTNINGCLOUD         25033
-#define SPELL_LIGHTNINGWAVE          24819
+enum Spells
+{
+    SPELL_LIGHTNINGCLOUD        = 25033,
+    SPELL_LIGHTNINGWAVE         = 24819
+};
 
 class boss_wushoolay : public CreatureScript
 {
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
index 1bd04abaa0f..7aae6cebff9 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -41,7 +41,7 @@ enum eSpells
     SPELL_MORTAL_WOUND     = 30641,
     H_SPELL_MORTAL_WOUND   = 36814,
     SPELL_SURGE            = 34645,
-    SPELL_RETALIATION      = 22857,
+    SPELL_RETALIATION      = 22857
 };
 
 class boss_watchkeeper_gargolmar : public CreatureScript
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
index fe89925b6f9..20531f1f110 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
@@ -38,7 +38,7 @@ enum Spells
     SPELL_SUMMON_REINFORCEMENTS = 34803
 };
 
-enum
+enum Events
 {
     EVENT_ARCANE_RESONANCE      = 1,
     EVENT_ARCANE_DEVASTATION    = 2