Core/Player: Split RemoveQuest into 2 separate functions
--HG-- branch : trunk
This commit is contained in:
@@ -14641,7 +14641,7 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
|
||||
} else if (pQuest->IsWeekly())
|
||||
SetWeeklyQuestStatus(quest_id);
|
||||
|
||||
RemoveQuest(quest_id);
|
||||
RemoveActiveQuest(quest_id);
|
||||
|
||||
m_RewardedQuests.insert(quest_id);
|
||||
m_RewardedQuestsSave[quest_id] = true;
|
||||
@@ -15210,7 +15210,7 @@ void Player::SetQuestStatus(uint32 quest_id, QuestStatus status)
|
||||
UpdateForQuestWorldObjects();
|
||||
}
|
||||
|
||||
void Player::RemoveQuest(uint32 quest_id)
|
||||
void Player::RemoveActiveQuest(uint32 quest_id)
|
||||
{
|
||||
QuestStatusMap::iterator itr = m_QuestStatus.find(quest_id);
|
||||
if (itr != m_QuestStatus.end())
|
||||
@@ -15219,7 +15219,10 @@ void Player::RemoveQuest(uint32 quest_id)
|
||||
m_QuestStatusSave[quest_id] = false;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void Player::RemoveRewardedQuest(uint32 quest_id)
|
||||
{
|
||||
RewardedQuestSet::iterator rewItr = m_RewardedQuests.find(quest_id);
|
||||
if (rewItr != m_RewardedQuests.end())
|
||||
{
|
||||
|
||||
@@ -1340,7 +1340,8 @@ class Player : public Unit, public GridObject<Player>
|
||||
bool GetQuestRewardStatus(uint32 quest_id) const;
|
||||
QuestStatus GetQuestStatus(uint32 quest_id) const;
|
||||
void SetQuestStatus(uint32 quest_id, QuestStatus status);
|
||||
void RemoveQuest(uint32 quest_id);
|
||||
void RemoveActiveQuest(uint32 quest_id);
|
||||
void RemoveRewardedQuest(uint32 quest_id);
|
||||
|
||||
void SetDailyQuestStatus(uint32 quest_id);
|
||||
void SetWeeklyQuestStatus(uint32 quest_id);
|
||||
|
||||
Reference in New Issue
Block a user