From 250a00cc1c91d2df2b6c4f72a2ad322b46fed783 Mon Sep 17 00:00:00 2001 From: n0n4m3 Date: Thu, 24 Dec 2009 10:20:15 +0100 Subject: Temporary revert 6743 commit. I fix this patch across 1-2 days. --HG-- branch : trunk --- src/game/AchievementMgr.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/game/AchievementMgr.cpp') diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index aaacee695fd..b7175a09af3 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -34,7 +34,7 @@ #include "Player.h" #include "ProgressBar.h" #include "SpellMgr.h" -#include "TimeMgr.h" + #include "MapManager.h" #include "BattleGround.h" #include "BattleGroundAB.h" @@ -552,7 +552,7 @@ void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *cri continue; } - if (criteria->timeLimit && time_t(date + criteria->timeLimit) < sGameTime.GetGameTime()) + if (criteria->timeLimit && time_t(date + criteria->timeLimit) < time(NULL)) continue; CriteriaProgress& progress = m_criteriaProgress[id]; @@ -612,7 +612,7 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement) WorldPacket data(SMSG_ACHIEVEMENT_EARNED, 8+4+8); data.append(GetPlayer()->GetPackGUID()); data << uint32(achievement->ID); - data << uint32(secsToTimeBitFields(sGameTime.GetGameTime())); + data << uint32(secsToTimeBitFields(time(NULL))); data << uint32(0); GetPlayer()->SendMessageToSetInRange(&data, sWorld.getConfig(CONFIG_LISTEN_RANGE_SAY), true); } @@ -1623,7 +1623,7 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry, progress = &m_criteriaProgress[entry->ID]; progress->counter = changeValue; - progress->date = sGameTime.GetGameTime(); + progress->date = time(NULL); } else { @@ -1658,7 +1658,7 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry, if(entry->timeLimit) { - time_t now = sGameTime.GetGameTime(); + time_t now = time(NULL); if(time_t(progress->date + entry->timeLimit) < now) progress->counter = 1; @@ -1680,7 +1680,7 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement) SendAchievementEarned(achievement); CompletedAchievementData& ca = m_completedAchievements[achievement->ID]; - ca.date = sGameTime.GetGameTime(); + ca.date = time(NULL); ca.changed = true; // don't insert for ACHIEVEMENT_FLAG_REALM_FIRST_KILL since otherwise only the first group member would reach that achievement -- cgit v1.2.3