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
@@ -36,7 +36,7 @@ protected:
    std::string address;
    int port = 0;
    // Sending message to server logic
-    int bytesRead = -1;
+    size_t bytesRead = 0;

    // Packet loss logic
    PacketID m_PacketID = 0;
@@ -67,6 +67,7 @@ protected:
    std::vector<Events::InputCommand> m_InputCommandBuffer;

    // Private member functions
+    size_t  receive(char* data);
    void disconnect();
    void parseMessageType(Packet& packet);
    void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID, const std::string& componentType);