From 3b4402b88bf3233a4a47bf1c91236f9a1aa450f7 Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Sat, 14 Feb 2009 14:19:34 +0300 Subject: [PATCH] [7278] In case gossip flag use gossip menu instead quest menu as client expected. Signed-off-by: VladimirMangos --- src/game/Creature.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 26b6464ea..cee13c874 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -812,8 +812,8 @@ void Creature::sendPreparedGossip(Player* player) if(!player) return; - // in case empty gossip menu open quest menu if any - if (player->PlayerTalkClass->GetGossipMenu().Empty() && !player->PlayerTalkClass->GetQuestMenu().Empty()) + // in case no gossip flag and quest menu not empty, open quest menu (client expect gossip menu with this flag) + if (!HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_GOSSIP) && !player->PlayerTalkClass->GetQuestMenu().Empty()) { player->SendPreparedQuest(GetGUID()); return; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 4bce31dd4..a7a583b97 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7277" + #define REVISION_NR "7278" #endif // __REVISION_NR_H__