From c23a998f9dfde519b5462c50c651a760bfc7ad1c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 16 Apr 2018 16:28:48 -0400 Subject: [PATCH] TraversalClient: Use u32 instead of enet_uint32 Lessens the dependence on the enet library (and we really don't need to rely on a third-party library for a 32-bit integer type) --- Source/Core/Common/TraversalClient.cpp | 4 ++-- Source/Core/Common/TraversalClient.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp index f87fd7e603..4c415b2c64 100644 --- a/Source/Core/Common/TraversalClient.cpp +++ b/Source/Core/Common/TraversalClient.cpp @@ -243,7 +243,7 @@ void TraversalClient::ResendPacket(OutgoingTraversalPacketInfo* info) void TraversalClient::HandleResends() { - enet_uint32 now = enet_time_get(); + const u32 now = enet_time_get(); for (auto& tpi : m_OutgoingTraversalPackets) { if (now - tpi.sendTime >= (u32)(300 * tpi.tries)) @@ -265,7 +265,7 @@ void TraversalClient::HandleResends() void TraversalClient::HandlePing() { - enet_uint32 now = enet_time_get(); + const u32 now = enet_time_get(); if (m_State == Connected && now - m_PingTime >= 500) { TraversalPacket ping = {}; diff --git a/Source/Core/Common/TraversalClient.h b/Source/Core/Common/TraversalClient.h index e3ca60bfbc..78e1d0c705 100644 --- a/Source/Core/Common/TraversalClient.h +++ b/Source/Core/Common/TraversalClient.h @@ -59,7 +59,7 @@ private: { TraversalPacket packet; int tries; - enet_uint32 sendTime; + u32 sendTime; }; void HandleServerPacket(TraversalPacket* packet); // called from NetHost @@ -80,7 +80,7 @@ private: ENetAddress m_ServerAddress{}; std::string m_Server; u16 m_port; - enet_uint32 m_PingTime = 0; + u32 m_PingTime = 0; }; extern std::unique_ptr g_TraversalClient; // the NetHost connected to the TraversalClient.