Revert "feat(core): Ensure that all actions are compared to fixed point in time (#1236) (#1458)" (#1471)
This reverts commit 51b8773528.
This commit is contained in:
@@ -13,7 +13,6 @@
|
||||
#include <openssl/md5.h>
|
||||
#include <openssl/sha.h>
|
||||
#include "World.h"
|
||||
#include "GameTime.h"
|
||||
#include "Player.h"
|
||||
#include "Util.h"
|
||||
#include "Warden.h"
|
||||
@@ -89,7 +88,7 @@ void Warden::Update()
|
||||
{
|
||||
if (_initialized)
|
||||
{
|
||||
uint32 currentTimestamp = GameTime::GetGameTimeMS();
|
||||
uint32 currentTimestamp = World::GetGameTimeMS();
|
||||
uint32 diff = getMSTimeDiff(_previousTimestamp, currentTimestamp);
|
||||
_previousTimestamp = currentTimestamp;
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
#include "ByteBuffer.h"
|
||||
#include <openssl/md5.h>
|
||||
#include "World.h"
|
||||
#include "GameTime.h"
|
||||
#include "Player.h"
|
||||
#include "Util.h"
|
||||
#include "WardenMac.h"
|
||||
@@ -190,7 +189,7 @@ void WardenMac::HandleHashResult(ByteBuffer &buff)
|
||||
|
||||
_initialized = true;
|
||||
|
||||
_previousTimestamp = GameTime::GetGameTimeMS();
|
||||
_previousTimestamp = World::GetGameTimeMS();
|
||||
}
|
||||
|
||||
void WardenMac::RequestData()
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
#include <openssl/md5.h>
|
||||
#include "Database/DatabaseEnv.h"
|
||||
#include "World.h"
|
||||
#include "GameTime.h"
|
||||
#include "Player.h"
|
||||
#include "Util.h"
|
||||
#include "WardenWin.h"
|
||||
@@ -184,7 +183,7 @@ void WardenWin::HandleHashResult(ByteBuffer &buff)
|
||||
|
||||
_initialized = true;
|
||||
|
||||
_previousTimestamp = GameTime::GetGameTimeMS();
|
||||
_previousTimestamp = World::GetGameTimeMS();
|
||||
}
|
||||
|
||||
void WardenWin::RequestData()
|
||||
@@ -200,7 +199,7 @@ void WardenWin::RequestData()
|
||||
if (_otherChecksTodo.empty())
|
||||
_otherChecksTodo.assign(sWardenCheckMgr->OtherChecksIdPool.begin(), sWardenCheckMgr->OtherChecksIdPool.end());
|
||||
|
||||
_serverTicks = GameTime::GetGameTimeMS();
|
||||
_serverTicks = World::GetGameTimeMS();
|
||||
|
||||
uint16 id;
|
||||
uint8 type;
|
||||
@@ -388,7 +387,7 @@ void WardenWin::HandleData(ByteBuffer &buff)
|
||||
buff >> newClientTicks;
|
||||
|
||||
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
|
||||
uint32 ticksNow = GameTime::GetGameTimeMS();
|
||||
uint32 ticksNow = World::GetGameTimeMS();
|
||||
uint32 ourTicks = newClientTicks + (ticksNow - _serverTicks);
|
||||
|
||||
sLog->outDebug(LOG_FILTER_WARDEN, "ServerTicks %u", ticksNow); // Now
|
||||
|
||||
Reference in New Issue
Block a user