Skip to content
Snippets Groups Projects
Commit 2a3bd700 authored by HoelShare's avatar HoelShare
Browse files

GPN

parent 488e58ff
No related branches found
No related tags found
No related merge requests found
...@@ -192,7 +192,7 @@ void loop() { ...@@ -192,7 +192,7 @@ void loop() {
Serial.println("Loop - Server - Ende"); Serial.println("Loop - Server - Ende");
} }
if (client) { if (client) {
// client->update(); client->update();
} }
Serial.println("Loop - Ende"); Serial.println("Loop - Ende");
} }
......
...@@ -77,10 +77,7 @@ void GameClient::joinGame(String ip) { ...@@ -77,10 +77,7 @@ void GameClient::joinGame(String ip) {
void GameClient::update() { void GameClient::update() {
Serial.println("GameClient - Update"); Serial.println("GameClient - Update");
if(reopen) {
reopen = false;
ui->open(playerList);
}
// String lastHitBy; // String lastHitBy;
// int lastDamage; // int lastDamage;
// //
......
...@@ -24,11 +24,13 @@ void GameServer::secureQuestion() { ...@@ -24,11 +24,13 @@ void GameServer::secureQuestion() {
secureMenu = new PlayerListMenu(4); secureMenu = new PlayerListMenu(4);
secureMenu->addMenuItem(new MenuItem("Start?", [=]() { this->startGame(); Serial.println("Lambda Start - Ende"); })); secureMenu->addMenuItem(new MenuItem("Start?", [=]() { this->startGame(); Serial.println("Lambda Start - Ende"); }));
secureMenu->addMenuItem(new MenuItem("Cancel?", [=]() { secureMenu->addMenuItem(new MenuItem("Cancel?", [=]() {
ui->open(playerList); ui->dispatchInput(badge->getJoystickState());
ui->closeCurrent();
ui->draw(); ui->draw();
})); }));
secureMenu->setRightAction([=]() { secureMenu->setRightAction([=]() {
ui->open(playerList); ui->dispatchInput(badge->getJoystickState());
ui->closeCurrent();
ui->draw(); ui->draw();
}); });
secureMenu->setLeftAction([=]() { this->startGame(); }); secureMenu->setLeftAction([=]() { this->startGame(); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment