diff --git a/app/src/main/java/org/toop/app/game/Connect4Game.java b/app/src/main/java/org/toop/app/game/Connect4Game.java index 77bda9c..a777858 100644 --- a/app/src/main/java/org/toop/app/game/Connect4Game.java +++ b/app/src/main/java/org/toop/app/game/Connect4Game.java @@ -85,6 +85,7 @@ public class Connect4Game { if (onForfeit == null || onExit == null) { new Thread(this::localGameThread).start(); + setGameLabels(information.players[0].isHuman); } else { new EventFlow() .listen(NetworkEvents.GameMoveResponse.class, this::onMoveResponse) @@ -102,7 +103,13 @@ public class Connect4Game { private void localGameThread() { while (isRunning.get()) { final int currentTurn = game.getCurrentTurn(); - setGameLabels(information.players[currentTurn].isHuman); + final String currentValue = currentTurn == 0? "RED" : "BLUE"; + final int nextTurn = (currentTurn + 1) % GameInformation.Type.playerCount(information.type); + + view.nextPlayer(information.players[currentTurn].isHuman, + information.players[currentTurn].name, + currentValue, + information.players[nextTurn].name); Game.Move move = null; diff --git a/app/src/main/java/org/toop/app/game/ReversiGame.java b/app/src/main/java/org/toop/app/game/ReversiGame.java index f1b8045..e438dd2 100644 --- a/app/src/main/java/org/toop/app/game/ReversiGame.java +++ b/app/src/main/java/org/toop/app/game/ReversiGame.java @@ -89,6 +89,7 @@ public final class ReversiGame { if (onForfeit == null || onExit == null) { new Thread(this::localGameThread).start(); + setGameLabels(information.players[0].isHuman); } else { new EventFlow() .listen(NetworkEvents.GameMoveResponse.class, this::onMoveResponse) @@ -116,7 +117,13 @@ public final class ReversiGame { } final int currentTurn = game.getCurrentTurn(); - setGameLabels(information.players[currentTurn].isHuman); + final String currentValue = currentTurn == 0? "BLACK" : "WHITE"; + final int nextTurn = (currentTurn + 1) % GameInformation.Type.playerCount(information.type); + + view.nextPlayer(information.players[currentTurn].isHuman, + information.players[currentTurn].name, + currentValue, + information.players[nextTurn].name); Game.Move move = null; diff --git a/app/src/main/java/org/toop/app/game/TicTacToeGame.java b/app/src/main/java/org/toop/app/game/TicTacToeGame.java index 6448835..2a0a24f 100644 --- a/app/src/main/java/org/toop/app/game/TicTacToeGame.java +++ b/app/src/main/java/org/toop/app/game/TicTacToeGame.java @@ -101,7 +101,13 @@ public final class TicTacToeGame { private void localGameThread() { while (isRunning.get()) { final int currentTurn = game.getCurrentTurn(); - setGameLabels(information.players[currentTurn].isHuman); + final String currentValue = currentTurn == 0? "X" : "O"; + final int nextTurn = (currentTurn + 1) % GameInformation.Type.playerCount(information.type); + + view.nextPlayer(information.players[currentTurn].isHuman, + information.players[currentTurn].name, + currentValue, + information.players[nextTurn].name); Game.Move move = null;