commit 3c0c7f83a26a6dd552d711b06ddb4fffd4671704 parent 802b34ff87c118742056fe87ff2e690e4a7d87ae Author: William Lindholm <william_lindholm@outlook.com> Date: Wed, 27 Nov 2024 18:28:35 +0000 Resetting grid when creating or joining new game Diffstat:
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/ContentPanes/MainContentPanel.java b/TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/ContentPanes/MainContentPanel.java @@ -143,6 +143,7 @@ public class MainContentPanel extends CustomPanel { joinGameButton.addActionListener(e -> { // join the game using GID if (client.GID_Temp != null) { + client.resetGame(); client.UID2 = client.proxy.joinGame(Integer.parseInt(client.UID), Integer.parseInt(client.GID_Temp)); client.GID = client.GID_Temp; client.HOST_UID = ""; diff --git a/TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/ContentPanes/TicTacToeGrid.java b/TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/ContentPanes/TicTacToeGrid.java @@ -65,6 +65,12 @@ public class TicTacToeGrid extends JPanel { public void refresh() { System.out.println("UID: " + client.UID + ", HOST_UID: " + client.HOST_UID + ", GAME_ID: " + client.GID + ", MOVES: " + client.NUM_OF_MOVES + ", ISHOST: " + helperMethods.IsHost()); + + for (var button : gridButtons) { + button.setText(""); + button.setEnabled(true); + } + if (client.BOARD == null) { return; } diff --git a/TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/TicTacToeClient.java b/TicTacToeClient/src/main/java/com/groupproject/tictactoeclient/TicTacToeClient.java @@ -87,12 +87,12 @@ public class TicTacToeClient { //reset the game data when user goes back to the main menu //might be more to do but at the moment it works fine public void resetGame() { - + this.BOARD = null; this.GID = ""; this.UID2 = null; this.HOST_UID = ""; this.NUM_OF_MOVES = 0; - this.BOARD = new int [2][2]; + refreshCurrentPanel(); }