diff options
| author | megamage <none@none> | 2009-02-15 12:00:37 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-15 12:00:37 -0600 |
| commit | 19f8347a5884af61583be2939d2e607b58a668c0 (patch) | |
| tree | d4362e0d14b0a0ae1d76116ca897ef047ae6156b | |
| parent | 3b741f1e61c75849968dcc93d963a018b42c9f20 (diff) | |
[7278] In case gossip flag use gossip menu instead quest menu as client expected. Author: NoFantasy <NoFantasy@getmangos.com>
--HG--
branch : trunk
| -rw-r--r-- | src/game/Creature.cpp | 4 | ||||
| -rw-r--r-- | 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 b6444b7c493..d9cd7b6a0c8 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -930,8 +930,8 @@ void Creature::sendPreparedGossip(Player* player) if(GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_WORLDEVENT) // if world event npc then gameeventmgr.HandleWorldEventGossip(player, this); // update world state with progress - // 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 4bce31dd454..a7a583b97da 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__ |