diff options
| author | Gacko <gacko28@gmx.de> | 2013-03-31 15:45:20 +0200 |
|---|---|---|
| committer | Gacko <gacko28@gmx.de> | 2013-03-31 15:46:32 +0200 |
| commit | 34c73a512186a8eb009392b54aaa198e998a50eb (patch) | |
| tree | 246d7f57f9ede595f42640d0e1d32c54557a6cfb | |
| parent | b8de1fdd846dad6cd3525123fd580d149aded749 (diff) | |
Core/Player: showQuests check in PrepareGossipMenu for GameObjects
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 65b0fc8b005..e12e5eef238 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -14318,12 +14318,11 @@ void Player::PrepareGossipMenu(WorldObject* source, uint32 menuId /*= 0*/, bool if (source->GetTypeId() == TYPEID_UNIT) { npcflags = source->GetUInt32Value(UNIT_NPC_FLAGS); - if (npcflags & UNIT_NPC_FLAG_QUESTGIVER && showQuests) + if (showQuests && npcflags & UNIT_NPC_FLAG_QUESTGIVER) PrepareQuestMenu(source->GetGUID()); } - - if (source->GetTypeId() == TYPEID_GAMEOBJECT) - if (source->ToGameObject()->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) + else if (source->GetTypeId() == TYPEID_GAMEOBJECT) + if (showQuests && source->ToGameObject()->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) PrepareQuestMenu(source->GetGUID()); for (GossipMenuItemsContainer::const_iterator itr = menuItemBounds.first; itr != menuItemBounds.second; ++itr) |