diff --git a/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java b/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java index 70b256a..d535941 100644 --- a/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java +++ b/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java @@ -27,6 +27,9 @@ public class GenericGameController> implements GameCo // Reference to gameView view protected final GameView gameView; + // Reference to String gametype + protected final String gameType; + // Reference to game canvas protected final GameCanvas canvas; @@ -39,6 +42,7 @@ public class GenericGameController> implements GameCo this.canvas = canvas; this.game = game; + this.gameType = gameType; this.gameThreadBehaviour = gameThreadBehaviour; // Tell thread how to send moves @@ -136,5 +140,12 @@ public class GenericGameController> implements GameCo @Override public void updateUI() { canvas.redraw(game.deepCopy()); + gameView.updatePlayerInfo( + true, + getCurrentPlayer().getName(), + game.getCurrentTurn() == 0 ? "X" : "O", + getPlayer((game.getCurrentTurn() + 1 ) % 2).getName(), + this.gameType + ); } } diff --git a/app/src/main/java/org/toop/app/widget/view/GameView.java b/app/src/main/java/org/toop/app/widget/view/GameView.java index 94d8cd7..182b826 100644 --- a/app/src/main/java/org/toop/app/widget/view/GameView.java +++ b/app/src/main/java/org/toop/app/widget/view/GameView.java @@ -94,7 +94,7 @@ public final class GameView extends ViewWidget { } } - public void nextPlayer(boolean isMe, String currentPlayer, String currentMove, String nextPlayer, char GameType) { + public void updatePlayerInfo(boolean isMe, String currentPlayer, String currentMove, String nextPlayer, String GameType) { Platform.runLater(() -> { if (!(hasSet)) { playerHeader.setText(currentPlayer + " vs. " + nextPlayer); @@ -112,8 +112,8 @@ public final class GameView extends ViewWidget { new GameOverPopup(iWon, winner).show(Pos.CENTER); } - private void setPlayerHeaders(boolean isMe, String currentPlayer, String nextPlayer, char GameType) { - if (GameType == 'T') { + private void setPlayerHeaders(boolean isMe, String currentPlayer, String nextPlayer, String GameType) { + if (GameType.equals("TicTacToe")) { if (isMe) { player1Header.setText("X: " + currentPlayer); player2Header.setText("O: " + nextPlayer); @@ -124,7 +124,7 @@ public final class GameView extends ViewWidget { } setPlayerInfoTTT(); } - else if (GameType == 'R') { + else if (GameType.equals("Reversi")) { if (isMe) { player1Header.setText(currentPlayer); player2Header.setText(nextPlayer);