Fixed issue where onscreen Mine count didn't reincrease if flag was clicked

Added function unflagged that updates screen value.

Signed-off-by: Aiden Woodruff <aiden.woodruff@gmail.com>

2 files changed, 18 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index d171fb8..13454de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-06-29  Aiden Woodruff  <aiden.woodruff@gmail.com>
+
+        * sweeper.js (unflagged): Function added. Scans and updates Mine count on screen.
+        (flag): Calls unflagged()
+        (reveal): Calls unflagged() if item is flagged.
+        (populate_board): Don't do anything with unflagged.
+
 2018-06-28  Aiden Woodruff  <aiden.woodruff@gmail.com>
 
         * index.html: Fixed meta with no close bracket.
diff --git a/sweeper.js b/sweeper.js
index 1a67b54..966a533 100644
--- a/sweeper.js
+++ b/sweeper.js
@@ -1,7 +1,6 @@
 // Global variables
 var boardmap = Array();
 var mines = Array();
-var unflagged = 0;
 var table = "";
 var height = 0;
 var width = 0;
@@ -83,6 +82,12 @@ function get_cell (x, y) {
     return document.getElementById( (x.toString() + "," + y.toString() ) );
 }
 
+// Updates unflagged (or really, unrevealed) mine count
+function unflagged () {
+    document.getElementById("minecount").innerHTML = "Mines: " + (total_mines - Array.concat.apply([], boardmap).filter(x => x.status === "F").length).toString();
+    return true;
+}
+
 // Return x y dict from cell object
 function get_cell_xy (object) {
     coord = new Coordinates();
@@ -221,8 +226,11 @@ function reveal (e) {
     coord = get_cell_xy(object);
     if (boardmap[coord.y][coord.x].status === "R") {
         return;
-    } else if (boardmap[coord.y][coord.x].status === "U" || boardmap[coord.y][coord.x].status === "F") {
+    } else if (boardmap[coord.y][coord.x].status === "U") {
         boardmap[coord.y][coord.x].status = "R";
+    } else if (boardmap[coord.y][coord.x].status === "F") {
+        boardmap[coord.y][coord.x].status = "R";
+        unflagged();
     }
     object.classList.remove("flagged");
     object.classList.remove("unrevealed");
@@ -295,15 +303,13 @@ function flag (e) {
         boardmap[coord.y][coord.x].status = "U";
         object.classList.remove("flagged");
         object.classList.add("unrevealed");
-        unflagged++;
     } else if (boardmap[coord.y][coord.x].status === "U") {
         boardmap[coord.y][coord.x].status = "F";
         object.classList.remove("unrevealed");
         object.classList.add("flagged");
-        unflagged--;
     } else if (boardmap[coord.y][coord.x].status === "R") {
     }
-    document.getElementById("minecount").innerHTML = "Mines: " + unflagged.toString();
+    unflagged();
 }
 
 function update_leaderboard () {
@@ -401,8 +407,6 @@ function populate_board (e) {
         mines = mines.filter(value => { return ! value.equals(disclude); });
     }
 
-    unflagged = mines.length;
-
     // Place mines
     for (var i = 0; i < mines.length; i++) {
         boardmap[mines[i].y][mines[i].x].value = "M";