From fd0c8ba765a488713cc51c0280b1a5cf22d38ce1 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Sun, 7 Jun 2020 14:50:29 +0200 Subject: [PATCH] stuff --- core/src/netwerkprog/game/client/MainGame.java | 4 ++-- .../game/client/game/map/GameInputProcessor.java | 2 ++ core/src/netwerkprog/game/util/data/ReadyData.java | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 core/src/netwerkprog/game/util/data/ReadyData.java diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java index aec2b72..5841659 100644 --- a/core/src/netwerkprog/game/client/MainGame.java +++ b/core/src/netwerkprog/game/client/MainGame.java @@ -353,10 +353,10 @@ public class MainGame extends Game implements ClientCallback { @Override public void onDataReceived(Data data) { - System.out.println("[MAINGAME CALLBACK] Got data: " + data.toString()); + System.out.println("[MAINGAME" + this.username + "] Got data: " + data.toString()); if (data instanceof NameData) { this.username = ((NameData) data).getName(); - System.out.println("[MAINGAME CALLBACK] username is: " + username); + System.out.println("[MAINGAME" + this.username + "] username is: " + username); } else if (data instanceof TeamData) { // check if it is not our own message if (!((TeamData) data).getUsername().equals(this.username)) { diff --git a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java index d84cbc1..c680b36 100644 --- a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java +++ b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java @@ -10,6 +10,7 @@ import com.badlogic.gdx.utils.TimeUtils; import netwerkprog.game.client.MainGame; import netwerkprog.game.client.game.GAMESTATE; import netwerkprog.game.util.data.Data; +import netwerkprog.game.util.data.ReadyData; import netwerkprog.game.util.data.TeamData; import netwerkprog.game.util.game.Faction; import netwerkprog.game.util.game.GameCharacter; @@ -132,6 +133,7 @@ public class GameInputProcessor implements InputProcessor { // camera.translate(-400, 0); // mainGame.setGamestate(GAMESTATE.PLAYING); } + mainGame.send(new ReadyData()); } return false; diff --git a/core/src/netwerkprog/game/util/data/ReadyData.java b/core/src/netwerkprog/game/util/data/ReadyData.java new file mode 100644 index 0000000..89f4a06 --- /dev/null +++ b/core/src/netwerkprog/game/util/data/ReadyData.java @@ -0,0 +1,7 @@ +package netwerkprog.game.util.data; + +public class ReadyData extends Data { + public ReadyData() { + super("ready"); + } +}