From ac9b14d70ce27b78f11edb99957219e5734eeae7 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Mon, 19 Jan 2009 17:55:33 +0300 Subject: [PATCH] [7116] Correctly show quest/gossip menues. In case non defeault gossip text with quest only In case empty quest and gossip menus and gossip text. --- src/game/Creature.cpp | 4 +--- src/game/GossipDef.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index c8189cf14..28cb26d94 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -813,10 +813,8 @@ void Creature::sendPreparedGossip(Player* player) if(!player) return; - GossipMenu& gossipmenu = player->PlayerTalkClass->GetGossipMenu(); - // in case empty gossip menu open quest menu if any - if (gossipmenu.Empty() && GetNpcTextId() == 0) + if (player->PlayerTalkClass->GetGossipMenu().Empty() && !player->PlayerTalkClass->GetQuestMenu().Empty()) { player->SendPreparedQuest(GetGUID()); return; diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp index 7b375f228..8a8dcb736 100644 --- a/src/game/GossipDef.cpp +++ b/src/game/GossipDef.cpp @@ -125,7 +125,7 @@ bool PlayerMenu::GossipOptionCoded( unsigned int Selection ) void PlayerMenu::SendGossipMenu( uint32 TitleTextId, uint64 npcGUID ) { WorldPacket data( SMSG_GOSSIP_MESSAGE, (100) ); // guess size - data << npcGUID; + data << uint64(npcGUID); data << uint32(0); // new 2.4.0 data << uint32( TitleTextId ); data << uint32( mGossipMenu.MenuItemCount() ); // max count 0x0F