Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Groups: Use std::chrono type for Group::m_readyCheckTimer

Browse Source
This commit is contained in:
Shauren
2021-04-06 00:05:46 +02:00
parent d29dd1eeb5
commit 48b63c4c67
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Groups/Group.cpp
View File

@@ -63,7 +63,7 @@ Group::Group() : m_leaderGuid(), m_leaderName(""), m_groupFlags(GROUP_FLAG_NONE)
m_dungeonDifficulty(DIFFICULTY_NORMAL), m_raidDifficulty(DIFFICULTY_NORMAL_RAID), m_legacyRaidDifficulty(DIFFICULTY_10_N),
m_bgGroup(nullptr), m_bfGroup(nullptr), m_lootMethod(FREE_FOR_ALL), m_lootThreshold(ITEM_QUALITY_UNCOMMON), m_looterGuid(),
m_masterLooterGuid(), m_subGroupsCounts(nullptr), m_guid(), m_maxEnchantingLevel(0), m_dbStoreId(0),
m_readyCheckStarted(false), m_readyCheckTimer(0), m_activeMarkers(0)
m_readyCheckStarted(false), m_readyCheckTimer(Milliseconds::zero()), m_activeMarkers(0)
{
for (uint8 i = 0; i < TARGET_ICONS_COUNT; ++i)
m_targetIcons[i].Clear();
@@ -2274,12 +2274,12 @@ void Group::UpdateReadyCheck(uint32 diff)
if (!m_readyCheckStarted)
return;
m_readyCheckTimer -= diff;
if (m_readyCheckTimer <= 0)
m_readyCheckTimer -= Milliseconds(diff);
if (m_readyCheckTimer <= Milliseconds::zero())
EndReadyCheck();
}
void Group::StartReadyCheck(ObjectGuid starterGuid, int8 partyIndex, uint32 duration)
void Group::StartReadyCheck(ObjectGuid starterGuid, int8 partyIndex, Milliseconds duration)
{
if (m_readyCheckStarted)
return;
@@ -2299,7 +2299,7 @@ void Group::StartReadyCheck(ObjectGuid starterGuid, int8 partyIndex, uint32 dura
readyCheckStarted.PartyGUID = m_guid;
readyCheckStarted.PartyIndex = partyIndex;
readyCheckStarted.InitiatorGUID = starterGuid;
readyCheckStarted.Duration = duration;
readyCheckStarted.Duration = uint32(duration.count());
BroadcastPacket(readyCheckStarted.Write(), false);
}
@@ -2309,7 +2309,7 @@ void Group::EndReadyCheck(void)
return;
m_readyCheckStarted = false;
m_readyCheckTimer = 0;
m_readyCheckTimer = Milliseconds::zero();
ResetMemberReadyChecked();

4
src/server/game/Groups/Group.h
View File

@@ -270,7 +270,7 @@ class TC_GAME_API Group
void UpdateReadyCheck(uint32 diff);
// Ready check
void StartReadyCheck(ObjectGuid starterGuid, int8 partyIndex, uint32 duration = READYCHECK_DURATION);
void StartReadyCheck(ObjectGuid starterGuid, int8 partyIndex, Milliseconds duration = Milliseconds(READYCHECK_DURATION));
void EndReadyCheck();
bool IsReadyCheckStarted(void) const { return m_readyCheckStarted; }
@@ -454,7 +454,7 @@ class TC_GAME_API Group
// Ready Check
bool m_readyCheckStarted;
int32 m_readyCheckTimer;
Milliseconds m_readyCheckTimer;
// Raid markers
std::array<std::unique_ptr<RaidMarker>, RAID_MARKERS_COUNT> m_markers;