show mine locations when game is lost (#6); clean up a bit; include #9 functionality

Author: mac-edmondson

assets.h

@@ -118,6 +118,18 @@ static uint8_t tile_flag_bits[] = {
     0x81,
     0xFF,
 };
+#define tile_udflag_width 8
+#define tile_udflag_height 8
+static uint8_t tile_udflag_bits[] = {
+    0xFF,
+    0x81,
+    0xB9,
+    0x91,
+    0x91,
+    0x9d,
+    0x81,
+    0xFF,
+};
 #define tile_mine_width 8
 #define tile_mine_height 8
 static uint8_t tile_mine_bits[] = {

minesweeper.c

@@ -27,7 +27,7 @@ typedef struct {
 } PluginEvent;
 
 typedef enum {
-    TileType0, // this HAS to be in order, for hint assignment to be ez pz
+    TileType0, // this HAS to be here in order, for hint assignment to be ez pz
     TileType1,
     TileType2,
     TileType3,
@@ -38,6 +38,7 @@ typedef enum {
     TileType8,
     TileTypeUncleared,
     TileTypeFlag,
+    TileTypeUdFlag,
     TileTypeMine
 } TileType;
 
@@ -53,6 +54,7 @@ typedef struct {
     int fields_cleared;
     int flags_set;
     bool game_started;
+    bool game_over;
     uint32_t game_started_tick;
 } Minesweeper;
 
@@ -80,7 +82,11 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     mineStr = furi_string_alloc();
     timeStr = furi_string_alloc();
 
-    furi_string_printf(mineStr, "Mines: %d", MINECOUNT - minesweeper_state->flags_set);
+    if(minesweeper_state->game_over) {
+        furi_string_printf(mineStr, "GAME OVER. * to cont.");
+    } else {
+        furi_string_printf(mineStr, "Mines: %d", MINECOUNT - minesweeper_state->flags_set);
+    }
     canvas_set_font(canvas, FontSecondary);
     canvas_draw_str_aligned(canvas, 0, 0, AlignLeft, AlignTop, furi_string_get_cstr(mineStr));
 
@@ -133,6 +139,9 @@ static void render_callback(Canvas* const canvas, void* ctx) {
             case TileTypeFlag:
                 tile_to_draw = tile_flag_bits;
                 break;
+            case TileTypeUdFlag:
+                tile_to_draw = tile_udflag_bits;
+                break;
             case TileTypeUncleared:
                 tile_to_draw = tile_uncleared_bits;
                 break;
@@ -174,7 +183,7 @@ static void setup_playfield(Minesweeper* minesweeper_state) {
         int rand_y = rand() % PLAYFIELD_HEIGHT;
         // make sure first guess isn't a mine
         if(minesweeper_state->minefield[rand_x][rand_y] == FieldEmpty &&
-           (minesweeper_state->cursor_x != rand_x && minesweeper_state->cursor_y != rand_y)) {
+           (minesweeper_state->cursor_x != rand_x || minesweeper_state->cursor_y != rand_y)) {
             minesweeper_state->minefield[rand_x][rand_y] = FieldMine;
             mines_left--;
         }
@@ -215,10 +224,7 @@ static bool game_lost(Minesweeper* minesweeper_state) {
 
     dialog_message_set_icon(message, NULL, 0, 10);
 
-    NotificationApp* notifications = furi_record_open(RECORD_NOTIFICATION);
-    notification_message(notifications, &sequence_set_vibro_on);
-    furi_record_close(RECORD_NOTIFICATION);
-    furi_timer_start(minesweeper_state->timer, (uint32_t)furi_kernel_get_tick_frequency() * 0.2);
+    minesweeper_state->game_over = false; // reset the game state
 
     DialogMessageButton choice = dialog_message_show(dialogs, message);
     dialog_message_free(message);
@@ -259,7 +265,12 @@ static bool game_won(Minesweeper* minesweeper_state) {
 // returns false if the move loses the game - otherwise true
 static bool play_move(Minesweeper* minesweeper_state, int cursor_x, int cursor_y) {
     if(minesweeper_state->playfield[cursor_x][cursor_y] == TileTypeFlag) {
-        // we're on a flagged field, do nothing
+        // if the game is over and the flagged feild wasn't a mine, let the player know with an
+        // upside down flag
+        if(minesweeper_state->game_over &&
+           minesweeper_state->minefield[cursor_x][cursor_y] != FieldMine) {
+            minesweeper_state->playfield[cursor_x][cursor_y] = TileTypeUdFlag;
+        }
         return true;
     }
     if(minesweeper_state->minefield[cursor_x][cursor_y] == FieldMine) {
@@ -289,7 +300,7 @@ static bool play_move(Minesweeper* minesweeper_state, int cursor_x, int cursor_y
         }
         int mines = minesweeper_state->playfield[cursor_x][cursor_y]; // ¯\_(ツ)_/¯
         if(flags == mines) {
-            // auto uncover all non-flags around (to win faster ;)
+            // auto uncover all non-flags around (to win faster;) )
             for(int auto_y = cursor_y - 1; auto_y <= cursor_y + 1; auto_y++) {
                 for(int auto_x = cursor_x - 1; auto_x <= cursor_x + 1; auto_x++) {
                     if(auto_x == cursor_x && auto_y == cursor_y) {
@@ -342,7 +353,7 @@ static bool play_move(Minesweeper* minesweeper_state, int cursor_x, int cursor_y
                 if(auto_x >= 0 && auto_x < PLAYFIELD_WIDTH && auto_y >= 0 &&
                    auto_y < PLAYFIELD_HEIGHT) {
                     if(minesweeper_state->playfield[auto_x][auto_y] == TileTypeUncleared) {
-                        play_move(minesweeper_state, auto_x, auto_y);
+                        (void)play_move(minesweeper_state, auto_x, auto_y);
                     }
                 }
             }
@@ -354,6 +365,7 @@ static bool play_move(Minesweeper* minesweeper_state, int cursor_x, int cursor_y
 static void minesweeper_state_init(Minesweeper* const minesweeper_state) {
     minesweeper_state->cursor_x = minesweeper_state->cursor_y = 0;
     minesweeper_state->game_started = false;
+    minesweeper_state->game_over = false;
     for(int y = 0; y < PLAYFIELD_HEIGHT; y++) {
         for(int x = 0; x < PLAYFIELD_WIDTH; x++) {
             minesweeper_state->playfield[x][y] = TileTypeUncleared;
@@ -381,7 +393,7 @@ int32_t minesweeper_app(void* p) {
 
     FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
 
-    Minesweeper* minesweeper_state = malloc(sizeof(Minesweeper));
+    Minesweeper* minesweeper_state = (Minesweeper*)malloc(sizeof(Minesweeper));
     // setup
     minesweeper_state_init(minesweeper_state);
 
@@ -435,18 +447,38 @@ int32_t minesweeper_app(void* p) {
                             setup_playfield(minesweeper_state);
                             minesweeper_state->game_started = true;
                         }
-                        if(!play_move(
-                               minesweeper_state,
-                               minesweeper_state->cursor_x,
-                               minesweeper_state->cursor_y)) {
-                            // ooops. looks like we hit a mine!
+                        if(minesweeper_state->game_over) {
+                            // if the game is over and the player presses okay, bring them to the
+                            // game over menu. This allows a player to see all the mine locations
+                            // before being taken away from the playfield.
                             if(game_lost(minesweeper_state)) {
                                 // player wants to restart.
                                 setup_playfield(minesweeper_state);
                             } else {
                                 // player wants to exit :(
                                 processing = false;
                             }
+                        } else if(!play_move(
+                                      minesweeper_state,
+                                      minesweeper_state->cursor_x,
+                                      minesweeper_state->cursor_y)) {
+                            // ooops. looks like we hit a mine!
+
+                            // give the player some feedback
+                            NotificationApp* notifications = furi_record_open(RECORD_NOTIFICATION);
+                            notification_message(notifications, &sequence_set_vibro_on);
+                            furi_record_close(RECORD_NOTIFICATION);
+                            furi_timer_start(
+                                minesweeper_state->timer,
+                                (uint32_t)furi_kernel_get_tick_frequency() * 0.2);
+
+                            minesweeper_state->game_over = true;
+                            // Call play move for every space to reveal all the mines
+                            for(int mx = 0; mx < PLAYFIELD_WIDTH; ++mx) {
+                                for(int my = 0; my < PLAYFIELD_HEIGHT; ++my) {
+                                    play_move(minesweeper_state, mx, my);
+                                }
+                            }
                         } else {
                             // check win condition.
                             if(minesweeper_state->fields_cleared ==