aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2015-11-15 16:17:12 +0100
committerCarbenium <carbenium@outlook.com>2015-11-23 10:11:55 +0100
commit7e056e25c741ae1b80a2b4961d30870ff2902d92 (patch)
treead17bbe4027902937663742aa5a8f3cddbe32880 /src
parent27e65ad33abd5377db4b28021c240814bcff3190 (diff)
Core/Quest: Fix issues reported by static analysis
Coverity defect IDs: 1339309, 1339310 (cherry picked from commit fbaed38b5ea605e3dbd65a99835db1778ac24391)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 28d3b9af769..1bad5c699e4 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -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;
}