diff --git a/GPN-Lasertag.ino b/GPN_BadgeLasertag.ino similarity index 98% rename from GPN-Lasertag.ino rename to GPN_BadgeLasertag.ino index 4c52c61bb22e053e9681370dda1b5a106c65f065..e036549615dbdb9030e15f06487d74c5e4c01ce6 100644 --- a/GPN-Lasertag.ino +++ b/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 diff --git a/GameClient.cpp b/GameClient.cpp index 9fb24ea792eb19103e4e23e7f18f4e8b78cbe5ad..37e41ff51a3a0d47f0fd43fc5d67f791589b59c7 100644 --- a/GameClient.cpp +++ b/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()); } diff --git a/GameClient.hpp b/GameClient.hpp index 0c7370c7b66c19bfa43a65a75aec1c7aeebacc6a..f5770aa0ea1ca900a278cb4b948074d0e613e4aa 100644 --- a/GameClient.hpp +++ b/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