diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-01-12 19:17:39 +0100 |
|---|---|---|
| committer | treeston <treeston.mmoc@gmail.com> | 2016-01-12 19:17:39 +0100 |
| commit | 90914518184061d06c7bfba0aebc4ac03b23104f (patch) | |
| tree | f6a3091b0c43bfc2e3e1ec95cdb1cb04d9a2c1bb /src | |
| parent | 6710beed7592ed4ab385d9e18fdebe9d3371d68d (diff) | |
| parent | 22dd523c1f6071f591f4fa8d249464cb96e7febc (diff) | |
Merge remote-tracking branch 'tkrokli/gossip_accept_duel' into 3.3.5-base
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 c65ee5482e3..81044a0dbb1 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -449,8 +449,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, @@ -511,7 +509,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; |
