From dddfb6f62208505aee997bb5f7dda62c6f0a02bc Mon Sep 17 00:00:00 2001 From: "tyler :3" Date: Sun, 19 May 2024 12:28:21 +0100 Subject: [PATCH] incorrect flag losses --- src/main/java/com/shr4pnel/minesweeper/Controller.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/shr4pnel/minesweeper/Controller.java b/src/main/java/com/shr4pnel/minesweeper/Controller.java index 7772538..4acc04d 100644 --- a/src/main/java/com/shr4pnel/minesweeper/Controller.java +++ b/src/main/java/com/shr4pnel/minesweeper/Controller.java @@ -236,12 +236,17 @@ public class Controller { private void showAllBombs(int clickedColumn, int clickedRow) { for (Node node : grid.getChildren()) { + Button b = (Button) node; + String buttonURL = ((ImageView) b.getGraphic()).getImage().getUrl(); int column = GridPane.getColumnIndex(node); int row = GridPane.getRowIndex(node); if (!(column == clickedColumn && row == clickedRow) && wrapper.atColumn(column).atRow(row).isBomb()) { setImage((Button) node, "img/bomb_revealed.png"); } + if (buttonURL.contains("flagged.png") && !wrapper.atColumn(column).atRow(row).isBomb()) { + setImage(b, "img/bomb_wrong.png"); + } } } @@ -269,7 +274,6 @@ public class Controller { private void setAdjacentCount(Node tileClicked, int adjacentBombs) { Button button = (Button) tileClicked; - URL imageURL = getClass().getResource("img/num_" + adjacentBombs + ".png"); - button.setGraphic(new ImageView(new Image(String.valueOf(imageURL), 16, 16, true, false))); + setImage(button, "img/num_" + adjacentBombs + ".png"); } }