diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-08-31 00:59:04 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-18 17:50:00 +0100 |
| commit | bbbf8df8e52693699059669ffaecd512ccd02657 (patch) | |
| tree | 4d4ace8beedc10c86f561e9414629a56d85a7cca /src/server/game/Entities/Creature | |
| parent | f94dc007aedadd0e7f1d9f72702892ca5ec4b78d (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.
(cherry picked from commit d55426f5b4e431e6d398b1e2dbbd25f7387328f2)
Diffstat (limited to 'src/server/game/Entities/Creature')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index dc3dfd4c939..ac3dfae7fbf 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -49,6 +49,7 @@ #include "MiscPackets.h" #include "Transport.h" +#include "ScriptedGossip.h" TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const { @@ -980,12 +981,12 @@ bool Creature::isCanInteractWithBattleMaster(Player* player, bool msg) const if (!player->GetBGAccessByLevel(bgTypeId)) { - player->PlayerTalkClass->ClearMenus(); + ClearGossipMenuFor(player); switch (bgTypeId) { - case BATTLEGROUND_AV: player->PlayerTalkClass->SendGossipMenu(7616, GetGUID()); break; - case BATTLEGROUND_WS: player->PlayerTalkClass->SendGossipMenu(7599, GetGUID()); break; - case BATTLEGROUND_AB: player->PlayerTalkClass->SendGossipMenu(7642, GetGUID()); break; + case BATTLEGROUND_AV: SendGossipMenuFor(player, 7616, this); break; + case BATTLEGROUND_WS: SendGossipMenuFor(player, 7599, this); break; + case BATTLEGROUND_AB: SendGossipMenuFor(player, 7642, this); break; case BATTLEGROUND_EY: case BATTLEGROUND_NA: case BATTLEGROUND_BE: @@ -993,7 +994,7 @@ bool Creature::isCanInteractWithBattleMaster(Player* player, bool msg) const case BATTLEGROUND_RL: case BATTLEGROUND_SA: case BATTLEGROUND_DS: - case BATTLEGROUND_RV: player->PlayerTalkClass->SendGossipMenu(10024, GetGUID()); break; + case BATTLEGROUND_RV: SendGossipMenuFor(player, 10024, this); break; default: break; } return false; |