Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Criteria: Use std::chrono type for CriteriaHandler::SendCriteriaUpdate

Browse Source
This commit is contained in:
Shauren
2021-04-06 00:12:01 +02:00
parent 48b63c4c67
commit 33bce9e28b
8 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Achievements/AchievementMgr.cpp
View File

@@ -582,7 +582,7 @@ bool PlayerAchievementMgr::ModifierTreeSatisfied(uint32 modifierTreeId) const
return false;
}
void PlayerAchievementMgr::SendCriteriaUpdate(Criteria const* criteria, CriteriaProgress const* progress, uint32 timeElapsed, bool timedCompleted) const
void PlayerAchievementMgr::SendCriteriaUpdate(Criteria const* criteria, CriteriaProgress const* progress, Seconds timeElapsed, bool timedCompleted) const
{
if (criteria->FlagsCu & CRITERIA_FLAG_CU_ACCOUNT)
{
@@ -596,7 +596,7 @@ void PlayerAchievementMgr::SendCriteriaUpdate(Criteria const* criteria, Criteria
criteriaUpdate.Progress.Flags = timedCompleted ? 1 : 0; // 1 is for keeping the counter at 0 in client
criteriaUpdate.Progress.Date = progress->Date;
criteriaUpdate.Progress.TimeFromStart = timeElapsed;
criteriaUpdate.Progress.TimeFromStart = uint32(timeElapsed.count());
criteriaUpdate.Progress.TimeFromCreate = 0;
SendPacket(criteriaUpdate.Write());
@@ -613,7 +613,7 @@ void PlayerAchievementMgr::SendCriteriaUpdate(Criteria const* criteria, Criteria
criteriaUpdate.Flags = timedCompleted ? 1 : 0; // 1 is for keeping the counter at 0 in client
criteriaUpdate.CurrentTime = progress->Date;
criteriaUpdate.ElapsedTime = timeElapsed;
criteriaUpdate.ElapsedTime = uint32(timeElapsed.count());
criteriaUpdate.CreationTime = 0;
SendPacket(criteriaUpdate.Write());
@@ -965,7 +965,7 @@ void GuildAchievementMgr::CompletedAchievement(AchievementEntry const* achieveme
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
void GuildAchievementMgr::SendCriteriaUpdate(Criteria const* entry, CriteriaProgress const* progress, Seconds /*timeElapsed*/, bool /*timedCompleted*/) const
{
WorldPackets::Achievement::GuildCriteriaUpdate guildCriteriaUpdate;
guildCriteriaUpdate.Progress.resize(1);

4
src/server/game/Achievements/AchievementMgr.h
View File

@@ -94,7 +94,7 @@ public:
bool ModifierTreeSatisfied(uint32 modifierTreeId) const;
protected:
void SendCriteriaUpdate(Criteria const* entry, CriteriaProgress const* progress, uint32 timeElapsed, bool timedCompleted) const override;
void SendCriteriaUpdate(Criteria const* entry, CriteriaProgress const* progress, Seconds timeElapsed, bool timedCompleted) const override;
void SendCriteriaProgressRemoved(uint32 criteriaId) override;
void SendAchievementEarned(AchievementEntry const* achievement) const;
@@ -127,7 +127,7 @@ public:
void CompletedAchievement(AchievementEntry const* entry, Player* referencePlayer) override;
protected:
void SendCriteriaUpdate(Criteria const* entry, CriteriaProgress const* progress, uint32 timeElapsed, bool timedCompleted) const override;
void SendCriteriaUpdate(Criteria const* entry, CriteriaProgress const* progress, Seconds timeElapsed, bool timedCompleted) const override;
void SendCriteriaProgressRemoved(uint32 criteriaId) override;
void SendAchievementEarned(AchievementEntry const* achievement) const;

4
src/server/game/Achievements/CriteriaHandler.cpp
View File

@@ -981,7 +981,7 @@ void CriteriaHandler::SetCriteriaProgress(Criteria const* criteria, uint64 chang
progress->Date = time(nullptr); // set the date to the latest update.
progress->PlayerGUID = referencePlayer ? referencePlayer->GetGUID() : ObjectGuid::Empty;
uint32 timeElapsed = 0;
Seconds timeElapsed = Seconds::zero();
if (criteria->Entry->StartTimer)
{
@@ -993,7 +993,7 @@ void CriteriaHandler::SetCriteriaProgress(Criteria const* criteria, uint64 chang
if (timedIter != _timeCriteriaTrees.end())
{
// Client expects this in packet
timeElapsed = criteria->Entry->StartTimer - (timedIter->second / IN_MILLISECONDS);
timeElapsed = Seconds(criteria->Entry->StartTimer - (timedIter->second / IN_MILLISECONDS));
// Remove the timer, we wont need it anymore
if (IsCompletedCriteriaTree(tree))

9
src/server/game/Achievements/CriteriaHandler.h
View File

@@ -18,10 +18,11 @@
#ifndef CriteriaHandler_h__
#define CriteriaHandler_h__
#include "DBCEnums.h"
#include "ObjectGuid.h"
#include "DatabaseEnvFwd.h"
#include "Common.h"
#include "DatabaseEnvFwd.h"
#include "DBCEnums.h"
#include "Duration.h"
#include "ObjectGuid.h"
#include <map>
#include <unordered_map>
#include <vector>
@@ -279,7 +280,7 @@ public:
void RemoveCriteriaTimer(CriteriaTimedTypes type, uint32 entry); // used for quest and scripted timed s
protected:
virtual void SendCriteriaUpdate(Criteria const* criteria, CriteriaProgress const* progress, uint32 timeElapsed, bool timedCompleted) const = 0;
virtual void SendCriteriaUpdate(Criteria const* criteria, CriteriaProgress const* progress, Seconds timeElapsed, bool timedCompleted) const = 0;
CriteriaProgress* GetCriteriaProgress(Criteria const* entry);
void SetCriteriaProgress(Criteria const* criteria, uint64 changeValue, Player* referencePlayer, ProgressType progressType = PROGRESS_SET);

4
src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp
View File

@@ -242,7 +242,7 @@ bool QuestObjectiveCriteriaMgr::HasCompletedObjective(QuestObjective const* ques
return _completedObjectives.find(questObjective->ID) != _completedObjectives.end();
}
void QuestObjectiveCriteriaMgr::SendCriteriaUpdate(Criteria const* criteria, CriteriaProgress const* progress, uint32 timeElapsed, bool timedCompleted) const
void QuestObjectiveCriteriaMgr::SendCriteriaUpdate(Criteria const* criteria, CriteriaProgress const* progress, Seconds timeElapsed, bool timedCompleted) const
{
WorldPackets::Achievement::CriteriaUpdate criteriaUpdate;
@@ -254,7 +254,7 @@ void QuestObjectiveCriteriaMgr::SendCriteriaUpdate(Criteria const* criteria, Cri
criteriaUpdate.Flags = timedCompleted ? 1 : 0; // 1 is for keeping the counter at 0 in client
criteriaUpdate.CurrentTime = progress->Date;
criteriaUpdate.ElapsedTime = timeElapsed;
criteriaUpdate.ElapsedTime = uint32(timeElapsed.count());
criteriaUpdate.CreationTime = 0;
SendPacket(criteriaUpdate.Write());

2
src/server/game/Quests/QuestObjectiveCriteriaMgr.h
View File

@@ -43,7 +43,7 @@ public:
bool HasCompletedObjective(QuestObjective const* questObjective) const;
protected:
void SendCriteriaUpdate(Criteria const* entry, CriteriaProgress const* progress, uint32 timeElapsed, bool timedCompleted) const override;
void SendCriteriaUpdate(Criteria const* entry, CriteriaProgress const* progress, Seconds timeElapsed, bool timedCompleted) const override;
void SendCriteriaProgressRemoved(uint32 criteriaId) override;

4
src/server/game/Scenarios/Scenario.cpp
View File

@@ -139,7 +139,7 @@ ScenarioStepState Scenario::GetStepState(ScenarioStepEntry const* step)
return itr->second;
}
void Scenario::SendCriteriaUpdate(Criteria const * criteria, CriteriaProgress const * progress, uint32 timeElapsed, bool timedCompleted) const
void Scenario::SendCriteriaUpdate(Criteria const * criteria, CriteriaProgress const * progress, Seconds timeElapsed, bool timedCompleted) const
{
WorldPackets::Scenario::ScenarioProgressUpdate progressUpdate;
progressUpdate.CriteriaProgress.Id = criteria->ID;
@@ -149,7 +149,7 @@ void Scenario::SendCriteriaUpdate(Criteria const * criteria, CriteriaProgress co
if (criteria->Entry->StartTimer)
progressUpdate.CriteriaProgress.Flags = timedCompleted ? 1 : 0;
progressUpdate.CriteriaProgress.TimeFromStart = timeElapsed;
progressUpdate.CriteriaProgress.TimeFromStart = uint32(timeElapsed.count());
progressUpdate.CriteriaProgress.TimeFromCreate = 0;
SendPacket(progressUpdate.Write());

2
src/server/game/Scenarios/Scenario.h
View File

@@ -76,7 +76,7 @@ class TC_GAME_API Scenario : public CriteriaHandler
protected:
GuidUnorderedSet _players;
void SendCriteriaUpdate(Criteria const* criteria, CriteriaProgress const* progress, uint32 timeElapsed, bool timedCompleted) const override;
void SendCriteriaUpdate(Criteria const* criteria, CriteriaProgress const* progress, Seconds timeElapsed, bool timedCompleted) const override;
void SendCriteriaProgressRemoved(uint32 /*criteriaId*/) override { }
bool CanUpdateCriteriaTree(Criteria const* criteria, CriteriaTree const* tree, Player* referencePlayer) const override;