diff options
| author | Spp <spp@jorge.gr> | 2012-11-22 15:04:59 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-22 15:04:59 +0100 |
| commit | b9b57c2d62fe68f5b35bf7cdb2fb6a68e501ca5e (patch) | |
| tree | 7c15f9bd2298d0fc8564a12397e485317e754bcd /src/server/scripts/EasternKingdoms/undercity.cpp | |
| parent | 7416ada4f7b28c6fa8a9fd18d90327c1314106d4 (diff) | |
| parent | 32c259b1ce88c36015514018e95a7d6c29420678 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Chat/ChatLink.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/ChannelHandler.cpp
src/server/scripts/EasternKingdoms/hinterlands.cpp
Diffstat (limited to 'src/server/scripts/EasternKingdoms/undercity.cpp')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/undercity.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/undercity.cpp index 6aaf2df0b22..05938452520 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/undercity.cpp @@ -41,8 +41,8 @@ EndContentData */ enum Sylvanas { QUEST_JOURNEY_TO_UNDERCITY = 9180, - SAY_LAMENT_END = -1000196, - EMOTE_LAMENT_END = -1000197, + EMOTE_LAMENT_END = 0, + SAY_LAMENT_END = 1, SOUND_CREDIT = 10896, ENTRY_HIGHBORNE_LAMENTER = 21628, @@ -153,8 +153,8 @@ public: LamentEventTimer = 2000; if (!me->HasAura(SPELL_SYLVANAS_CAST)) { - DoScriptText(SAY_LAMENT_END, me); - DoScriptText(EMOTE_LAMENT_END, me); + Talk(SAY_LAMENT_END); + Talk(EMOTE_LAMENT_END); LamentEvent = false; } } else LamentEventTimer -= diff; |