observer/libremines
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bad recursion

Browse Source
This commit is contained in:
tyler :3 2024-05-17 18:21:24 +01:00
parent 76d8ce23d9
commit 9fde49a8bb
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/java/com/shr4pnel/minesweeper/Controller.java
View File

@ -27,12 +27,15 @@ public class Controller {
private int time = 0; private int time = 0;
private long startTime; private long startTime;
private int bombCount = 99; private int bombCount = 99;
private boolean[][] expandedTiles;
@FXML @FXML
private void initialize() { private void initialize() {
setupGrid(); setupGrid();
gridHandler = new Grid(); gridHandler = new Grid();
wrapper = gridHandler.grid; wrapper = gridHandler.grid;
expandedTiles = new boolean[30][16];
} }
private void setupGrid() { private void setupGrid() {
@ -88,29 +91,18 @@ public class Controller {
} }
private void recursiveExpandTiles(int column, int row) { private void recursiveExpandTiles(int column, int row) {
if (row > 0) { if (column < 0 || column >= 30 || row < 0 || row >= 16 || expandedTiles[column][row] && !wrapper.atColumn(column).atRow(row).isBomb())
expandTile(column, row - 1); return;
} expandTile(column, row);
if (row > 0 && column < 29) { if (wrapper.atColumn(column).atRow(row).adjacentBombCount() == 0) {
expandTile(column + 1, row - 1); recursiveExpandTiles(column, row - 1);
} recursiveExpandTiles(column + 1, row - 1);
if (column < 29) { recursiveExpandTiles(column + 1, row);
expandTile(column + 1, row); recursiveExpandTiles(column + 1, row + 1);
} recursiveExpandTiles(column, row + 1);
if (row < 15 && column < 29) { recursiveExpandTiles(column - 1, row + 1);
expandTile(column + 1, row + 1); recursiveExpandTiles(column - 1, row);
} recursiveExpandTiles(column - 1, row - 1);
if (row < 15) {
expandTile(column, row + 1);
}
if (row < 15 && column > 0) {
expandTile(column - 1, row + 1);
}
if (column > 0) {
expandTile(column - 1, row);
}
if (row > 0 && column > 0) {
expandTile(column - 1, row - 1);
} }
} }
@ -121,7 +113,8 @@ public class Controller {
if (button.isVisible()) { if (button.isVisible()) {
int adjacentBombs = wrapper.atColumn(column).atRow(row).adjacentBombCount(); int adjacentBombs = wrapper.atColumn(column).atRow(row).adjacentBombCount();
setAdjacentCount(button, adjacentBombs); setAdjacentCount(button, adjacentBombs);
if (adjacentBombs == 0) { if (adjacentBombs == 0 && !expandedTiles[column][row]) {
expandedTiles[column][row] = true;
recursiveExpandTiles(column, row); recursiveExpandTiles(column, row);
} }
} }
@ -174,9 +167,20 @@ public class Controller {
} }
private void flag(Node tileClicked) { private void flag(Node tileClicked) {
Button tileAsButton = (Button) tileClicked;
ImageView tileGraphic = (ImageView) tileAsButton.getGraphic();
Image tileGraphicImage = tileGraphic.getImage();
boolean flagged = tileGraphicImage.getUrl().contains("flagged.png");
if (flagged) {
bombCount++;
setImage(tileAsButton, "img/blank.png");
updateBombCounter();
return;
}
bombCount--; bombCount--;
updateBombCounter(); updateBombCounter();
setImage((Button) tileClicked, "img/bomb_flagged.png"); setImage((Button) tileClicked, "img/bomb_flagged.png");
} }
private void updateBombCounter() { private void updateBombCounter() {