From cd6fcce84b0aefb2f5d0494cbfdbb5bf25061f2f Mon Sep 17 00:00:00 2001 From: tkrokli Date: Sat, 24 Sep 2016 19:20:12 +0200 Subject: Core/Scripts: move #define to enum/boss emote to DB (#17967) boss_lurker_below.cpp : remove deprecated #define entries - remove hardcoded text, use creature_text/broadcast_text - move #define value & text reference to enum section - replace TextEmote() with Talk() pointing to DB entry --- .../CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index ee7dca668a9..549786b1fd6 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -50,16 +50,18 @@ enum Spells SPELL_HAMSTRING = 26211 }; +enum Misc +{ + EMOTE_SPOUT = 0, // "The Lurker Below takes a deep breath." + SPOUT_DIST = 100 +}; + enum Creatures { NPC_COILFANG_GUARDIAN = 21873, NPC_COILFANG_AMBUSHER = 21865 }; -#define EMOTE_SPOUT "The Lurker Below takes a deep breath." - -#define SPOUT_DIST 100 - float AddPos[9][3] = { // MOVE_AMBUSHER_1 X, Y, Z @@ -240,7 +242,7 @@ public: if (SpoutTimer <= diff) { - me->TextEmote(EMOTE_SPOUT, nullptr, true); + Talk(EMOTE_SPOUT); me->SetReactState(REACT_PASSIVE); me->GetMotionMaster()->MoveRotate(20000, urand(0, 1) ? ROTATE_DIRECTION_LEFT : ROTATE_DIRECTION_RIGHT); SpoutTimer = 45000; -- cgit v1.2.3