Merge remote-tracking branch 'origin/master' into TCPConnections

# Conflicts: # include/Engine/Network/Client.h # include/Engine/Network/Network.h # include/Engine/Network/Packet.h # include/Engine/Network/Server.h # src/Engine/Network/Client.cpp # src/Engine/Network/Packet.cpp # src/Engine/Network/Server.cpp # src/Tests/HealthSystemTest.cpp
2016-02-10 17:05:07 +01:00
parent 4f2ad3ad00 019e85a425
commit 9645169797
189 changed files with 10536 additions and 1959 deletions
@@ -376,7 +376,7 @@ void Client::identifyPacketLoss()
 bool Client::hasServerTimedOut()
 {
    // Time in ms
-    float timeSincePing = 1000 * (std::clock() - m_StartPingTime) / static_cast<double>(CLOCKS_PER_SEC);
+    double timeSincePing = 1000 * (std::clock() - m_StartPingTime) / static_cast<double>(CLOCKS_PER_SEC);
    if (timeSincePing > m_TimeoutMs) {
        // Clear everything and go to menu.
        LOG_INFO("Server has timed out, returning to menu, Beep Boop.");