Merge pull request #6704 from 4m1g0/lookupQuest

Core/Commands: Fixed lookup quest command to show [rewarded] mark on rewarded quests
Closes #6452
This commit is contained in:
Nay
2012-06-03 05:32:03 -07:00
+22 -12
View File
@@ -1144,15 +1144,20 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args)
{
QuestStatus status = target->GetQuestStatus(qinfo->GetQuestId());
if (status == QUEST_STATUS_COMPLETE)
switch (status)
{
if (target->GetQuestRewardStatus(qinfo->GetQuestId()))
statusStr = GetTrinityString(LANG_COMMAND_QUEST_REWARDED);
else
case QUEST_STATUS_COMPLETE:
statusStr = GetTrinityString(LANG_COMMAND_QUEST_COMPLETE);
break;
case QUEST_STATUS_INCOMPLETE:
statusStr = GetTrinityString(LANG_COMMAND_QUEST_ACTIVE);
break;
case QUEST_STATUS_REWARDED:
statusStr = GetTrinityString(LANG_COMMAND_QUEST_REWARDED);
break;
default:
break;
}
else if (status == QUEST_STATUS_INCOMPLETE)
statusStr = GetTrinityString(LANG_COMMAND_QUEST_ACTIVE);
}
if (m_session)
@@ -1187,15 +1192,20 @@ bool ChatHandler::HandleLookupQuestCommand(const char *args)
{
QuestStatus status = target->GetQuestStatus(qinfo->GetQuestId());
if (status == QUEST_STATUS_COMPLETE)
switch (status)
{
if (target->GetQuestRewardStatus(qinfo->GetQuestId()))
statusStr = GetTrinityString(LANG_COMMAND_QUEST_REWARDED);
else
case QUEST_STATUS_COMPLETE:
statusStr = GetTrinityString(LANG_COMMAND_QUEST_COMPLETE);
break;
case QUEST_STATUS_INCOMPLETE:
statusStr = GetTrinityString(LANG_COMMAND_QUEST_ACTIVE);
break;
case QUEST_STATUS_REWARDED:
statusStr = GetTrinityString(LANG_COMMAND_QUEST_REWARDED);
break;
default:
break;
}
else if (status == QUEST_STATUS_INCOMPLETE)
statusStr = GetTrinityString(LANG_COMMAND_QUEST_ACTIVE);
}
if (m_session)