Merge remote-tracking branch 'origin/master'

GameClient.cpp

@@ -57,20 +57,20 @@ void GameClient::joinGame(String ip) {
 
     Serial.printf("Conn data:\n\tip: %s\n\tport: %d\n", ip.c_str(), SERVER_PORT);
 
-    //client->connect(ip.c_str(), SERVER_PORT);
+
+    client = new WiFiClient();
+
     Serial.printf("Trying to conncet!\n");
-    if (!client->connect("192.168.42.175", 4803)) {
-        Serial.printf("Connect failed!\n");
-    }
+    Serial.printf("My ip is %s\n", WiFi.localIP().toString().c_str());
+    client->connect(ip.c_str(), SERVER_PORT);
     Serial.printf("client->connect\n");
-    client->print(player->getNickname());
-    Serial.printf("client->print nickname\n");
-    client->flush();
-    Serial.printf("client->flush");
 
-    Serial.printf("Receiving");
+    client->println(player->getNickname());
+
+    //client->flush();
+
     String recv = client->readStringUntil('\n');
-    Serial.printf("RECV: %s", recv.c_str());
+    Serial.printf("RECV: %s\n", recv.c_str());
 }