diff options
| -rw-r--r-- | src/game/NPCHandler.cpp | 2 | ||||
| -rw-r--r-- | src/game/Player.cpp | 4 | ||||
| -rw-r--r-- | src/game/Player.h | 2 | ||||
| -rw-r--r-- | src/game/QuestHandler.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp index e490e82e372..4e73fb381af 100644 --- a/src/game/NPCHandler.cpp +++ b/src/game/NPCHandler.cpp @@ -333,7 +333,7 @@ void WorldSession::HandleGossipHelloOpcode(WorldPacket & recv_data) if (!sScriptMgr.GossipHello(_player, unit)) { // _player->TalkedToCreature(unit->GetEntry(), unit->GetGUID()); - _player->PrepareGossipMenu(unit, unit->GetCreatureInfo()->GossipMenuId); + _player->PrepareGossipMenu(unit, unit->GetCreatureInfo()->GossipMenuId, true); _player->SendPreparedGossip(unit); } } diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 5a99c66d8ee..aae3890940f 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -13257,7 +13257,7 @@ void Player::SendNewItem(Item *item, uint32 count, bool received, bool created, /*** GOSSIP SYSTEM ***/ /*********************************************************/ -void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId) +void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId, bool showQuests) { PlayerMenu* pMenu = PlayerTalkClass; pMenu->ClearMenus(); @@ -13278,7 +13278,7 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId) { pCreature = pSource->ToCreature(); npcflags = pCreature->GetUInt32Value(UNIT_NPC_FLAGS); - if (npcflags & UNIT_NPC_FLAG_QUESTGIVER) + if (npcflags & UNIT_NPC_FLAG_QUESTGIVER && showQuests) PrepareQuestMenu(pSource->GetGUID()); } else if (pSource->GetTypeId() == TYPEID_GAMEOBJECT) diff --git a/src/game/Player.h b/src/game/Player.h index 9bc658aade2..d5dd504a3b1 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -1223,7 +1223,7 @@ class Player : public Unit, public GridObject<Player> /*** GOSSIP SYSTEM ***/ /*********************************************************/ - void PrepareGossipMenu(WorldObject *pSource, uint32 menuId = 0); + void PrepareGossipMenu(WorldObject *pSource, uint32 menuId = 0, bool showQuests = false); void SendPreparedGossip(WorldObject *pSource); void OnGossipSelect(WorldObject *pSource, uint32 gossipListId, uint32 menuId); diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp index 43213801ebb..8043f5ed149 100644 --- a/src/game/QuestHandler.cpp +++ b/src/game/QuestHandler.cpp @@ -104,7 +104,7 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket & recv_data) if (sScriptMgr.GossipHello(_player, pCreature)) return; - _player->PrepareGossipMenu(pCreature, pCreature->GetCreatureInfo()->GossipMenuId); + _player->PrepareGossipMenu(pCreature, pCreature->GetCreatureInfo()->GossipMenuId, true); _player->SendPreparedGossip(pCreature); } |