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/game/Entities | |
| 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/game/Entities')
| -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 424215168bb..7a40b43f236 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -47,6 +47,7 @@ #include "World.h" #include "WorldPacket.h" #include "Transport.h" +#include "ScriptedGossip.h" TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const { @@ -972,12 +973,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: @@ -985,7 +986,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; |