Core/Quest: Fix issues reported by static analysis

Coverity defect IDs: 1339309, 1339310

(cherry picked from commit fbaed38b5ea605e3dbd65a99835db1778ac24391)
This commit is contained in:
jackpoz
2015-11-23 10:11:55 +01:00
committed by Carbenium
parent 27e65ad33a
commit 7e056e25c7
+5 -3
View File
@@ -14991,8 +14991,9 @@ bool Player::GetQuestRewardStatus(uint32 quest_id) const
if (qInfo->IsSeasonal() && !qInfo->IsRepeatable())
{
uint16 eventId = sGameEventMgr->GetEventIdForQuest(qInfo);
if (m_seasonalquests.find(eventId) != m_seasonalquests.end())
return m_seasonalquests.find(eventId)->second.find(quest_id) != m_seasonalquests.find(eventId)->second.end();
auto seasonalQuestItr = m_seasonalquests.find(eventId);
if (seasonalQuestItr != m_seasonalquests.end())
return seasonalQuestItr->second.find(quest_id) != seasonalQuestItr->second.end();
return false;
}
@@ -15020,7 +15021,8 @@ QuestStatus Player::GetQuestStatus(uint32 quest_id) const
if (qInfo->IsSeasonal() && !qInfo->IsRepeatable())
{
uint16 eventId = sGameEventMgr->GetEventIdForQuest(qInfo);
if (m_seasonalquests.find(eventId) == m_seasonalquests.end() || m_seasonalquests.find(eventId)->second.find(quest_id) == m_seasonalquests.find(eventId)->second.end())
auto seasonalQuestItr = m_seasonalquests.find(eventId);
if (seasonalQuestItr == m_seasonalquests.end() || seasonalQuestItr->second.find(quest_id) == seasonalQuestItr->second.end())
return QUEST_STATUS_NONE;
}