From 22dd523c1f6071f591f4fa8d249464cb96e7febc Mon Sep 17 00:00:00 2001 From: tkrokli Date: Tue, 12 Jan 2016 09:38:56 +0100 Subject: Core/Scripts: move GOSSIP_ACCEPT_DUEL to DB Another attempt to shorten the list of hardcoded gossip menu options. This is the gossip menu option of the NPC ID 28406, Death Knight Initiate in Death's Breach in the Scarlet Enclave, the death knight starting area. This gossip is tied to the quest "Death's Challenge". Removing this text in the core script: "I challenge you, death knight!" (#define GOSSIP_ACCEPT_DUEL) and using `ADD_GOSSIP_ITEM_DB()` to pull the gossip_menu_option 9765 from the database instead. --- src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') 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; -- cgit v1.2.3