Merge remote-tracking branch 'origin/Networking' into Networking

# Conflicts: # include/Engine/Network/Client.h # src/Engine/Network/Client.cpp
2015-12-17 11:24:34 +01:00
parent ba831f8a3c 2cb5441b1c
commit a6a08f48bb
4 changed files with 39 additions and 24 deletions
@@ -42,6 +42,7 @@ private:
    void ParseSnapshot(Package& package);
    void CreateNewPlayer(int i);
    void IdentifyPacketLoss();
+    bool IsConnected();

    // UDP logic
    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;