From 3d3ac83e2ed990ae21d443a228905da37a062fe2 Mon Sep 17 00:00:00 2001
From: fnord <olelange@protonmail.com>
Date: Sat, 27 May 2017 20:04:01 +0200
Subject: [PATCH] Moved .ino
---
GPN-Lasertag.ino => GPN_BadgeLasertag.ino | 4 ++--
GameClient.cpp | 8 +++++++-
GameClient.hpp | 4 +++-
3 files changed, 12 insertions(+), 4 deletions(-)
rename GPN-Lasertag.ino => GPN_BadgeLasertag.ino (98%)
diff --git a/GPN-Lasertag.ino b/GPN_BadgeLasertag.ino
similarity index 98%
rename from GPN-Lasertag.ino
rename to GPN_BadgeLasertag.ino
index 4c52c61..e036549 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 9fb24ea..37e41ff 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 0c7370c..f5770aa 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
--
GitLab