josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added possibility to start timed achievements with already lost time (will be used in battlegrounds)

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Shauren
2010-08-12 13:38:31 +02:00
parent ce5cf139f7
commit 087b273ad3
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Achievements/AchievementMgr.cpp
+5 -2
View File
@@ -1854,7 +1854,7 @@ void AchievementMgr::UpdateTimedAchievements(uint32 timeDiff)
} }
} }
void AchievementMgr::StartTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry) void AchievementMgr::StartTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry, uint32 timeLost /*= 0*/)
{ {
AchievementCriteriaEntryList const& achievementCriteriaList = sAchievementMgr.GetTimedAchievementCriteriaByType(type); AchievementCriteriaEntryList const& achievementCriteriaList = sAchievementMgr.GetTimedAchievementCriteriaByType(type);
for (AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i != achievementCriteriaList.end(); ++i) for (AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i != achievementCriteriaList.end(); ++i)
@@ -1866,13 +1866,16 @@ void AchievementMgr::StartTimedAchievement(AchievementCriteriaTimedTypes type, u
if (m_timedAchievements.find((*i)->ID) == m_timedAchievements.end() && !IsCompletedCriteria(*i, achievement)) if (m_timedAchievements.find((*i)->ID) == m_timedAchievements.end() && !IsCompletedCriteria(*i, achievement))
{ {
// Start the timer // Start the timer
m_timedAchievements[(*i)->ID] = (*i)->timeLimit * IN_MILLISECONDS; if ((*i)->timeLimit * IN_MILLISECONDS > timeLost)
{
m_timedAchievements[(*i)->ID] = (*i)->timeLimit * IN_MILLISECONDS - timeLost;
// and at client too // and at client too
SetCriteriaProgress(*i, 0, PROGRESS_SET); SetCriteriaProgress(*i, 0, PROGRESS_SET);
} }
} }
} }
}
void AchievementMgr::RemoveTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry) void AchievementMgr::RemoveTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry)
{ {
src/server/game/Achievements/AchievementMgr.h
+1 -1
View File
@@ -254,7 +254,7 @@ class AchievementMgr
bool HasAchieved(AchievementEntry const* achievement) const; bool HasAchieved(AchievementEntry const* achievement) const;
Player* GetPlayer() { return m_player; } Player* GetPlayer() { return m_player; }
void UpdateTimedAchievements(uint32 timeDiff); void UpdateTimedAchievements(uint32 timeDiff);
void StartTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry); void StartTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry, uint32 timeLost = 0);
void RemoveTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry); // used for quest and scripted timed achievements void RemoveTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry); // used for quest and scripted timed achievements
private: private: