From 8adf24605d0d1e82173e9170c772df76835916fe Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 28 Feb 2016 13:32:54 +0100 Subject: Merge pull request #16692 from tkrokli/headless_horseman_emote Core/Scripts/boss_headless_horseman: remove hardcoded text (cherry picked from commit 5accd69863133432b2166ec4e906a55730d94741) --- .../EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 7a6e3ec124d..a99b7b20103 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -134,8 +134,6 @@ static char const* Text[]= "Now, know demise!" }; -#define EMOTE_LAUGHS "Headless Horseman laughs" // needs assigned to db. - class npc_wisp_invis : public CreatureScript { public: @@ -347,7 +345,6 @@ public: Creature* speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000); if (speaker) speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false); - me->TextEmote(EMOTE_LAUGHS); } else laugh -= diff; } @@ -724,7 +721,6 @@ public: if (laugh <= diff) { laugh = urand(11000, 22000); - me->TextEmote(EMOTE_LAUGHS); DoPlaySoundToSet(me, RandomLaugh[rand32() % 3]); } else laugh -= diff; -- cgit v1.2.3