Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps

5 files changed, 36 insertions, 33 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
index 1b0897f1d5e..7509f6331f7 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
@@ -40,7 +40,10 @@ EndScriptData */
 #define SPELL_FIERY_BLAST           DUNGEON_MODE(N_SPELL_FIERY_BLAST, H_SPELL_FIERY_BLAST)
 #define SPELL_FOCUS_FIRE_VISUAL     42075 //need to find better visual
 
-#define EMOTE_FOCUSES_ON            "focuses on "
+enum Say
+{
+    EMOTE_FOCUSED                  = 0
+};
 
 class boss_shirrak_the_dead_watcher : public CreatureScript
 {
@@ -143,13 +146,7 @@ public:
                 {
                     FocusedTargetGUID = target->GetGUID();
                     me->SummonCreature(ENTRY_FOCUS_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500);
-
-                    // TODO: Find better way to handle emote
-                    // Emote
-                    std::string emote(EMOTE_FOCUSES_ON);
-                    emote.append(target->GetName());
-                    emote.push_back('!');
-                    me->MonsterTextEmote(emote.c_str(), 0, true);
+                    Talk(EMOTE_FOCUSED, FocusedTargetGUID);
                 }
                 FocusFire_Timer = 15000+(rand()%5000);
             } else FocusFire_Timer -= diff;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
index c7f378ce2fe..1e8fd8b2676 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
@@ -26,15 +26,21 @@ EndScriptData */
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 
-#define SPELL_LEVITATE             31704
-#define SPELL_SUSPENSION           31719
-#define SPELL_LEVITATION_PULSE     31701
-#define SPELL_MAGNETIC_PULL        31705
-#define SPELL_CHAIN_LIGHTNING      31717
-#define SPELL_STATIC_CHARGE        31715
-#define SPELL_SUMMON_SPORE_STRIDER 38755
-
-#define ENTRY_SPORE_STRIDER        22299
+enum Spells
+{
+    SPELL_LEVITATE              = 31704,
+    SPELL_SUSPENSION            = 31719,
+    SPELL_LEVITATION_PULSE      = 31701,
+    SPELL_MAGNETIC_PULL         = 31705,
+    SPELL_CHAIN_LIGHTNING       = 31717,
+    SPELL_STATIC_CHARGE         = 31715,
+    SPELL_SUMMON_SPORE_STRIDER  = 38755
+};
+
+enum CreatureIdS
+{
+    ENTRY_SPORE_STRIDER         = 22299
+};
 
 class boss_the_black_stalker : public CreatureScript
 {
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
index df60c924285..b83307d8dcc 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
@@ -29,24 +29,24 @@ EndScriptData */
 
 enum eSays
 {
-    SAY_AGGRO                  = 0,
-    SAY_SUMMON                 = 1,
-    SAY_CURSE                  = 2,
-    SAY_KILL_1                 = 3,
-    SAY_DIE                    = 4,
-    SAY_WIPE                   = 5,
+    SAY_AGGRO                    = 0,
+    SAY_SUMMON                   = 1,
+    SAY_CURSE                    = 2,
+    SAY_KILL_1                   = 3,
+    SAY_DIE                      = 4,
+    SAY_WIPE                     = 5
 };
 
 enum eSpells
 {
-    SPELL_ORBITAL_STRIKE       = 30637,
-    SPELL_SHADOW_WHIP          = 30638,
-    SPELL_TREACHEROUS_AURA     = 30695,
-    H_SPELL_BANE_OF_TREACHERY  = 37566,
-    SPELL_DEMONIC_SHIELD       = 31901,
-    SPELL_SHADOW_BOLT          = 30686,
-    H_SPELL_SHADOW_BOLT        = 39297,
-    SPELL_SUMMON_FIENDISH_HOUND= 30707,
+    SPELL_ORBITAL_STRIKE         = 30637,
+    SPELL_SHADOW_WHIP            = 30638,
+    SPELL_TREACHEROUS_AURA       = 30695,
+    H_SPELL_BANE_OF_TREACHERY    = 37566,
+    SPELL_DEMONIC_SHIELD         = 31901,
+    SPELL_SHADOW_BOLT            = 30686,
+    H_SPELL_SHADOW_BOLT          = 39297,
+    SPELL_SUMMON_FIENDISH_HOUND  = 30707
 };
 
 class boss_omor_the_unscarred : 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