Merge remote-tracking branch 'origin/DynamicPacketBuffer' into HUDDesync

# Conflicts: # include/Engine/Network/TCPServer.h # src/Engine/Network/TCPServer.cpp
2016-02-22 17:39:48 +01:00
parent 833006744a 34a71b0767
commit 845a30ed0f
14 changed files with 263 additions and 50 deletions
@@ -28,7 +28,7 @@ private:
    void handle_accept(boost::shared_ptr<boost::asio::ip::tcp::socket> socket,
        int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
        const boost::system::error_code& error);
-    int readBuffer(char* data, PlayerDefinition& playerDefinition);
+    int readBuffer(PlayerDefinition& playerDefinition);
    int GetPort();
    std::string GetAddress();
    int m_Port = 0;