Permalink
Browse files

Core/Player: showQuests check in PrepareGossipMenu for GameObjects

  • Loading branch information...
1 parent b8de1fd commit 34c73a512186a8eb009392b54aaa198e998a50eb @Gacko Gacko committed Mar 31, 2013
Showing with 3 additions and 4 deletions.
  1. +3 −4 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)

1 comment on commit 34c73a5

Please sign in to comment.