[7619] Work under Achievement and AchievementCriteriaCompletion Flags

Remove wrong (not fully correct) check in IsCompletedAchievement

Signed-off-by: DiSlord <dislord@nomail.com>
This commit is contained in:
DiSlord 2009-04-05 19:42:44 +04:00
parent a787741a5a
commit 0f23722eb8
3 changed files with 18 additions and 19 deletions

View file

@ -1107,8 +1107,7 @@ void AchievementMgr::CompletedCriteria(AchievementCriteriaEntry const* criteria,
if (m_completedAchievements.find(achievement->ID)!=m_completedAchievements.end())
return;
if ((criteria->referredAchievement==achievement->ID && (criteria->completionFlag & ACHIEVEMENT_CRITERIA_COMPLETE_FLAG_ALL)) ||
IsCompletedAchievement(achievement))
if (IsCompletedAchievement(achievement))
CompletedAchievement(achievement);
}
@ -1138,13 +1137,6 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry)
else
completed_all = false;
if(achievmentForTestId == entry->ID) // not referenced achievement
{
// completed as single req. criteria
if(completed && criteria->completionFlag & ACHIEVEMENT_CRITERIA_COMPLETE_FLAG_ALL)
return true;
}
// completed as have req. count of completed criterias
if(achievmentForTestCount > 0 && achievmentForTestCount <= count)
return true;