diff options
author | treeston <treeston.mmoc@gmail.com> | 2016-01-12 19:17:39 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2016-03-22 22:06:54 +0100 |
commit | a254bdff591a6be8f63c84a949c88f4e5504ceda (patch) | |
tree | 9b72b690931fc0d7b2730248aafbf20d8fd90b3c /src | |
parent | f7624e720668a56c3fd385915c16d49d74bf5cef (diff) |
Merge remote-tracking branch 'tkrokli/gossip_accept_duel' into 3.3.5-base
(cherry picked from commit 90914518184061d06c7bfba0aebc4ac03b23104f)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 1975ebe0021..6038b76f0d0 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -452,8 +452,6 @@ class npc_eye_of_acherus : public CreatureScript ## npc_death_knight_initiate ######*/ -#define GOSSIP_ACCEPT_DUEL "I challenge you, death knight!" - enum Spells_DKI { SPELL_DUEL = 52996, @@ -514,7 +512,7 @@ public: if (player->IsInCombat() || creature->IsInCombat()) return true; - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ACCEPT_DUEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); + player->ADD_GOSSIP_ITEM_DB(Player::GetDefaultGossipMenuForSource(creature), 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); } return true; |