diff options
Diffstat (limited to 'src/server/game/Achievements/AchievementMgr.cpp')
-rw-r--r-- | src/server/game/Achievements/AchievementMgr.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index b751ab1e82f..eec3c81fb35 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -57,7 +57,7 @@ void AchievementMgr::CheckAllAchievementCriteria(Player* referencePlayer) { // suppress sending packets for (uint32 i = 0; i < CRITERIA_TYPE_TOTAL; ++i) - UpdateCriteria(CriteriaTypes(i), 0, 0, 0, NULL, referencePlayer); + UpdateCriteria(CriteriaTypes(i), 0, 0, 0, nullptr, referencePlayer); } bool AchievementMgr::HasAchieved(uint32 achievementId) const @@ -258,7 +258,7 @@ void PlayerAchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, Pre if (criteriaResult) { - time_t now = time(NULL); + time_t now = time(nullptr); do { Field* fields = criteriaResult->Fetch(); @@ -498,7 +498,7 @@ void PlayerAchievementMgr::CompletedAchievement(AchievementEntry const* achievem TC_LOG_INFO("criteria.achievement", "PlayerAchievementMgr::CompletedAchievement(%u). %s", achievement->ID, GetOwnerInfo().c_str()); CompletedAchievementData& ca = _completedAchievements[achievement->ID]; - ca.Date = time(NULL); + ca.Date = time(nullptr); ca.Changed = true; if (achievement->Flags & (ACHIEVEMENT_FLAG_REALM_FIRST_REACH | ACHIEVEMENT_FLAG_REALM_FIRST_KILL)) @@ -507,8 +507,8 @@ void PlayerAchievementMgr::CompletedAchievement(AchievementEntry const* achievem if (!(achievement->Flags & ACHIEVEMENT_FLAG_TRACKING_FLAG)) _achievementPoints += achievement->Points; - UpdateCriteria(CRITERIA_TYPE_COMPLETE_ACHIEVEMENT, achievement->ID, 0, 0, NULL, referencePlayer); - UpdateCriteria(CRITERIA_TYPE_EARN_ACHIEVEMENT_POINTS, achievement->Points, 0, 0, NULL, referencePlayer); + UpdateCriteria(CRITERIA_TYPE_COMPLETE_ACHIEVEMENT, achievement->ID, 0, 0, nullptr, referencePlayer); + UpdateCriteria(CRITERIA_TYPE_EARN_ACHIEVEMENT_POINTS, achievement->Points, 0, 0, nullptr, referencePlayer); // reward items and titles if any AchievementReward const* reward = sAchievementMgr->GetAchievementReward(achievement); @@ -552,7 +552,7 @@ void PlayerAchievementMgr::CompletedAchievement(AchievementEntry const* achievem CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction(); - Item* item = reward->ItemId ? Item::CreateItem(reward->ItemId, 1, ItemContext::NONE, _owner) : NULL; + Item* item = reward->ItemId ? Item::CreateItem(reward->ItemId, 1, ItemContext::NONE, _owner) : nullptr; if (item) { // save new item before send @@ -661,7 +661,7 @@ void PlayerAchievementMgr::SendAchievementEarned(AchievementEntry const* achieve achievementEarned.Earner = _owner->GetGUID(); achievementEarned.EarnerNativeRealm = achievementEarned.EarnerVirtualRealm = GetVirtualRealmAddress(); achievementEarned.AchievementID = achievement->ID; - achievementEarned.Time = time(NULL); + achievementEarned.Time = time(nullptr); if (!(achievement->Flags & ACHIEVEMENT_FLAG_TRACKING_FLAG)) _owner->SendMessageToSetInRange(achievementEarned.Write(), sWorld->getFloatConfig(CONFIG_LISTEN_RANGE_SAY), true); else @@ -692,7 +692,7 @@ void GuildAchievementMgr::Reset() WorldPackets::Achievement::GuildAchievementDeleted guildAchievementDeleted; guildAchievementDeleted.AchievementID = iter->first; guildAchievementDeleted.GuildGUID = guid; - guildAchievementDeleted.TimeDeleted = time(NULL); + guildAchievementDeleted.TimeDeleted = time(nullptr); SendPacket(guildAchievementDeleted.Write()); } @@ -744,7 +744,7 @@ void GuildAchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, Prep if (criteriaResult) { - time_t now = time(NULL); + time_t now = time(nullptr); do { Field* fields = criteriaResult->Fetch(); @@ -933,7 +933,7 @@ void GuildAchievementMgr::CompletedAchievement(AchievementEntry const* achieveme SendAchievementEarned(achievement); CompletedAchievementData& ca = _completedAchievements[achievement->ID]; - ca.Date = time(NULL); + ca.Date = time(nullptr); ca.Changed = true; if (achievement->Flags & ACHIEVEMENT_FLAG_SHOW_GUILD_MEMBERS) @@ -942,7 +942,7 @@ void GuildAchievementMgr::CompletedAchievement(AchievementEntry const* achieveme ca.CompletingPlayers.insert(referencePlayer->GetGUID()); if (Group const* group = referencePlayer->GetGroup()) - for (GroupReference const* ref = group->GetFirstMember(); ref != NULL; ref = ref->next()) + for (GroupReference const* ref = group->GetFirstMember(); ref != nullptr; ref = ref->next()) if (Player const* groupMember = ref->GetSource()) if (groupMember->GetGuildId() == _owner->GetId()) ca.CompletingPlayers.insert(groupMember->GetGUID()); @@ -954,8 +954,8 @@ void GuildAchievementMgr::CompletedAchievement(AchievementEntry const* achieveme if (!(achievement->Flags & ACHIEVEMENT_FLAG_TRACKING_FLAG)) _achievementPoints += achievement->Points; - UpdateCriteria(CRITERIA_TYPE_COMPLETE_ACHIEVEMENT, achievement->ID, 0, 0, NULL, referencePlayer); - UpdateCriteria(CRITERIA_TYPE_EARN_ACHIEVEMENT_POINTS, achievement->Points, 0, 0, NULL, referencePlayer); + UpdateCriteria(CRITERIA_TYPE_COMPLETE_ACHIEVEMENT, achievement->ID, 0, 0, nullptr, referencePlayer); + UpdateCriteria(CRITERIA_TYPE_EARN_ACHIEVEMENT_POINTS, achievement->Points, 0, 0, nullptr, referencePlayer); } void GuildAchievementMgr::SendCriteriaUpdate(Criteria const* entry, CriteriaProgress const* progress, uint32 /*timeElapsed*/, bool /*timedCompleted*/) const @@ -999,7 +999,7 @@ void GuildAchievementMgr::SendAchievementEarned(AchievementEntry const* achievem WorldPackets::Achievement::GuildAchievementEarned guildAchievementEarned; guildAchievementEarned.AchievementID = achievement->ID; guildAchievementEarned.GuildGUID = _owner->GetGUID(); - guildAchievementEarned.TimeEarned = time(NULL); + guildAchievementEarned.TimeEarned = time(nullptr); SendPacket(guildAchievementEarned.Write()); } @@ -1032,19 +1032,19 @@ AchievementGlobalMgr* AchievementGlobalMgr::Instance() std::vector<AchievementEntry const*> const* AchievementGlobalMgr::GetAchievementByReferencedId(uint32 id) const { auto itr = _achievementListByReferencedId.find(id); - return itr != _achievementListByReferencedId.end() ? &itr->second : NULL; + return itr != _achievementListByReferencedId.end() ? &itr->second : nullptr; } AchievementReward const* AchievementGlobalMgr::GetAchievementReward(AchievementEntry const* achievement) const { auto iter = _achievementRewards.find(achievement->ID); - return iter != _achievementRewards.end() ? &iter->second : NULL; + return iter != _achievementRewards.end() ? &iter->second : nullptr; } AchievementRewardLocale const* AchievementGlobalMgr::GetAchievementRewardLocale(AchievementEntry const* achievement) const { auto iter = _achievementRewardLocales.find(achievement->ID); - return iter != _achievementRewardLocales.end() ? &iter->second : NULL; + return iter != _achievementRewardLocales.end() ? &iter->second : nullptr; } bool AchievementGlobalMgr::IsRealmCompleted(AchievementEntry const* achievement) const |