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

# Conflicts: # src/Engine/Network/Client.cpp
2015-12-14 16:41:59 +01:00
parent 36ae451ea6 63db236dfa
commit 8d9ff2b6dc
3 changed files with 79 additions and 80 deletions
@@ -4,9 +4,9 @@
 struct SnapshotDefinitions
 {
 	// "+Forward" is 8 characters * sizeof(char) = 8
-	char* InputForward = new char[8];
+	std::string InputForward;
 	// "+Right" is 6 characters * sizeof(char) = 6
-	char* InputRight = new char[6];
+    std::string InputRight;
 };

 struct IsWASDKeyDown