diff options
3 files changed, 2 insertions, 19 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedGossip.h b/src/server/game/AI/ScriptedAI/ScriptedGossip.h index 3d20f0aea3..41a8a50664 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedGossip.h +++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.h @@ -89,21 +89,4 @@ void SendGossipMenuFor(Player* player, uint32 npcTextID, Creature const* creatur // Close menu void CloseGossipMenuFor(Player* player); -/// Old macro. Need delete later -// This fuction add's a menu item, -// a - Icon Id -// b - Text -// c - Sender(this is to identify the current Menu with this item) -// d - Action (identifys this Menu Item) -// e - Text to be displayed in pop up box -// f - Money value in pop up box -#define ADD_GOSSIP_ITEM(a, b, c, d) PlayerTalkClass->GetGossipMenu().AddMenuItem(-1, a, b, c, d, "", 0) -#define ADD_GOSSIP_ITEM_EXTENDED(a, b, c, d, e, f, g) PlayerTalkClass->GetGossipMenu().AddMenuItem(-1, a, b, c, d, e, f, g) - -// This fuction Sends the current menu to show to client, a - NPCTEXTID(uint32), b - npc guid(ObjectGuid) -#define SEND_GOSSIP_MENU(a, b) PlayerTalkClass->SendGossipMenu(a, b) - -// Closes the Menu -#define CLOSE_GOSSIP_MENU() PlayerTalkClass->SendCloseGossip() - #endif diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index cefdab63ac..5bee1465f1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -375,7 +375,7 @@ public: if (!instance || instance->GetBossState(DATA_NEFARIAN) == DONE) return; - player->CLOSE_GOSSIP_MENU(); + CloseGossipMenuFor(player); Talk(SAY_GAMESBEGIN_1); BeginEvent(player); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index 91b277e507..a2ff803500 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -254,7 +254,7 @@ public: { if (sender == GOSSIP_ID && action == 0) { - player->CLOSE_GOSSIP_MENU(); + CloseGossipMenuFor(player); BeginSpeech(player); } } |