Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tkrokli/gossip_accept_duel' into 3.3.5-base

Browse Source 
(cherry picked from commit 9091451818)
This commit is contained in:
treeston
2016-01-12 19:17:39 +01:00
committed by Shauren
parent f7624e7206
commit a254bdff59
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
View File

@@ -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;