diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-12-13 20:10:23 +0100 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-12-13 20:10:23 +0100 |
| commit | a595a4a842123f10a4b27ae082794bad0250a307 (patch) | |
| tree | b0f50e06e6f7a55a8d5a18cfb37a53234f527236 /Tools/ProtoProxy/Connection.cpp | |
| parent | Added cocoa pod. (diff) | |
| parent | Merge pull request #1663 from mc-server/APIDumpSize (diff) | |
| download | cuberite-a595a4a842123f10a4b27ae082794bad0250a307.tar cuberite-a595a4a842123f10a4b27ae082794bad0250a307.tar.gz cuberite-a595a4a842123f10a4b27ae082794bad0250a307.tar.bz2 cuberite-a595a4a842123f10a4b27ae082794bad0250a307.tar.lz cuberite-a595a4a842123f10a4b27ae082794bad0250a307.tar.xz cuberite-a595a4a842123f10a4b27ae082794bad0250a307.tar.zst cuberite-a595a4a842123f10a4b27ae082794bad0250a307.zip | |
Diffstat (limited to 'Tools/ProtoProxy/Connection.cpp')
| -rw-r--r-- | Tools/ProtoProxy/Connection.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp index eaf4fab02..fb2d40e5b 100644 --- a/Tools/ProtoProxy/Connection.cpp +++ b/Tools/ProtoProxy/Connection.cpp @@ -189,7 +189,7 @@ cConnection::cConnection(SOCKET a_ClientSocket, cServer & a_Server) : m_Server(a_Server), m_ClientSocket(a_ClientSocket), m_ServerSocket(-1), - m_BeginTick(m_Timer.GetNowTime()), + m_BeginTick(std::chrono::steady_clock::now()), m_ClientState(csUnencrypted), m_ServerState(csUnencrypted), m_Nonce(0), @@ -436,7 +436,8 @@ bool cConnection::RelayFromClient(void) double cConnection::GetRelativeTime(void) { - return (double)(m_Timer.GetNowTime() - m_BeginTick) / 1000; + Int64 msec = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - m_BeginTick).count(); + return static_cast<double>(msec) / 1000; } |