diff --git a/src/main/java/Minesweeper/Cell.java b/src/main/java/Minesweeper/Cell.java index 8311365..31c0e7b 100644 --- a/src/main/java/Minesweeper/Cell.java +++ b/src/main/java/Minesweeper/Cell.java @@ -51,12 +51,14 @@ public class Cell extends JButton { protected void OnMouseClick() { if (!flagged) { + reveal(); if (type != CellType.Bomb) { flood(); } else { JOptionPane.showMessageDialog(getParent(),"KABOOM! Try again!"); playfield.reset(); } + } } @@ -82,7 +84,7 @@ public class Cell extends JButton { } } - public void update() { + public void reveal() { if (type == CellType.Number) { setText(String.valueOf(value)); } else { diff --git a/src/main/java/Minesweeper/Playfield.java b/src/main/java/Minesweeper/Playfield.java index f757df8..f2036df 100644 --- a/src/main/java/Minesweeper/Playfield.java +++ b/src/main/java/Minesweeper/Playfield.java @@ -1,5 +1,6 @@ package Minesweeper; +import java.awt.Color; import java.awt.Point; import javax.swing.JOptionPane; @@ -43,11 +44,9 @@ public class Playfield { cells[i][j].setBounds(j * CELLSIZE + (MsG.WIDTH / 2 - Size * CELLSIZE / 2), i * CELLSIZE + (MsG.HEIGTH / 2 - Size * CELLSIZE / 2), CELLSIZE, CELLSIZE); MsG.add(cells[i][j]); - for (int k = 0; k < bPlacement.length; k++) { if (bPlacement[k] == i * Size + j) { cells[i][j].type = CellType.Bomb; - cells[i][j].update(); break; } } @@ -61,6 +60,7 @@ public class Playfield { } } } + MsG.repaint(); } public void reset() { @@ -122,7 +122,6 @@ public class Playfield { } } - cells[row][column].update(); } public void cellFlooded() {