diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-08-31 00:59:04 +0200 |
|---|---|---|
| committer | treeston <treeston.mmoc@gmail.com> | 2016-08-31 00:59:04 +0200 |
| commit | d55426f5b4e431e6d398b1e2dbbd25f7387328f2 (patch) | |
| tree | ad997d2f8ffd65cba6cb7dbf794492def3e50e1d /src/server/scripts/EasternKingdoms/ZulAman | |
| parent | 54f923fdee9cf8a17e5eaee8a8f0290dadc9905b (diff) | |
Entities/Gossip: The Big One™ that gets rid of all uses of The Bad™ and The Ugly™, e.g. gossip preprocessor macros, and replaces them with the new-and-shiny gossip functions.
Diffstat (limited to 'src/server/scripts/EasternKingdoms/ZulAman')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 9b668169dca..825aa8d4e0a 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -133,17 +133,17 @@ class npc_zulaman_hostage : public CreatureScript bool OnGossipHello(Player* player, Creature* creature) override { - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HOSTAGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); + AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_HOSTAGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + SendGossipMenuFor(player, player->GetGossipTextId(creature), creature->GetGUID()); return true; } bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override { - player->PlayerTalkClass->ClearMenus(); + ClearGossipMenuFor(player); if (action == GOSSIP_ACTION_INFO_DEF + 1) - player->CLOSE_GOSSIP_MENU(); + CloseGossipMenuFor(player); if (!creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) return true; @@ -272,7 +272,7 @@ class npc_harrison_jones : public CreatureScript { if (me->GetCreatureTemplate()->GossipMenuId == menuId && !gossipListId) { - player->CLOSE_GOSSIP_MENU(); + CloseGossipMenuFor(player); me->SetFacingToObject(player); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); Talk(SAY_HARRISON_0); |