Moved .ino

GPN-Lasertag.ino → GPN_BadgeLasertag.ino

@@ -153,8 +153,8 @@ void joinGame() {
     Serial.printf("Received ip: %s", ip.c_str());
 
 
-    //client = new GameClient(ui, &badge, player);
-    //client->joinGame();
+    client = new GameClient(ui, &badge, player);
+    client->joinGame(ip);
 #ifdef DEBUG
     Serial.printf("Join - Ende\n");
 #endif

GameClient.cpp

@@ -37,12 +37,18 @@ void GameClient::startGame() {
 }
 
 
-void GameClient::joinGame() {
+void GameClient::joinGame(String ip) {
     badge->setVibrator(true);
     delay(200);
     badge->setVibrator(false);
     playerList->addMenuItem(new MenuItem(player->getNickname(), []() {}));
     ui->open(playerList);
+    client->connect(ip, SERVER_PORT);
+    client->print(player->getNickname());
+    client->flush();
+
+    String recv = client->readStringUntil('\n');
+    Serial.printf("RECV: %s", recv.c_str());
 }
 
 

GameClient.hpp

@@ -10,6 +10,8 @@
 #include "PlayerListMenu.hpp"
 #include "Player.hpp"
 
+#define SERVER_PORT 4803
+
 class GameClient {
 public:
     GameClient(WindowSystem *ui, Badge *badge, Player *player) : ui(ui), badge(badge), player(player) {}
@@ -28,7 +30,7 @@ private:
     WindowSystem *ui;
     Player *player;
     Badge *badge;
-    char *host = "127.000.000.1"; // MaxArraySize
+    char *host = "127.0.0.1"; // MaxArraySize
     PlayerListMenu *playerList = new PlayerListMenu(9);
     WiFiClient *client; // the client connected on client side