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

2016-02-03 10:29:36 +01:00
parent e133791369 24aac6a00d
commit 7bf4f5c30e
127 changed files with 3135 additions and 690 deletions
@@ -12,7 +12,7 @@
 #include <fstream>
 #include <iostream>

-#define INPUTSIZE 4097
+#define INPUTSIZE 32000
 typedef unsigned int PlayerID;
 typedef unsigned int PacketID;

@@ -34,6 +34,7 @@ private:

    // Sending messages to client logic
    std::map<PlayerID, PlayerDefinition> m_ConnectedPlayers;
+    // HACK: Fix INPUTSIZE
    char readBuffer[INPUTSIZE] = { 0 };
    int bytesRead = 0;
    // time for previouse message