[7278] In case gossip flag use gossip menu instead quest menu as client expected. Author: NoFantasy <[email protected]>

--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-15 12:00:37 -06:00
parent 3b741f1e61
commit 19f8347a58
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -930,8 +930,8 @@ void Creature::sendPreparedGossip(Player* player)
if(GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_WORLDEVENT) // if world event npc then if(GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_WORLDEVENT) // if world event npc then
gameeventmgr.HandleWorldEventGossip(player, this); // update world state with progress gameeventmgr.HandleWorldEventGossip(player, this); // update world state with progress
// in case empty gossip menu open quest menu if any // in case no gossip flag and quest menu not empty, open quest menu (client expect gossip menu with this flag)
if (player->PlayerTalkClass->GetGossipMenu().Empty() && !player->PlayerTalkClass->GetQuestMenu().Empty()) if (!HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_GOSSIP) && !player->PlayerTalkClass->GetQuestMenu().Empty())
{ {
player->SendPreparedQuest(GetGUID()); player->SendPreparedQuest(GetGUID());
return; return;
+1 -1
View File
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7277" #define REVISION_NR "7278"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__