Skip to content

Commit

Permalink
Minesweeper: make Field::flood_fill iterative
Browse files Browse the repository at this point in the history
This change uses an iterative traversal to avoid stack overflows
in, the previously recursive, flood_fill.
  • Loading branch information
DrewStratford authored and awesomekling committed Jul 29, 2019
1 parent 7cf4706 commit 77cb83b
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 7 deletions.
40 changes: 33 additions & 7 deletions Games/Minesweeper/Field.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "Field.h"
#include <AK/HashTable.h>
#include <AK/DoublyLinkedList.h>
#include <LibCore/CConfigFile.h>
#include <LibGUI/GButton.h>
#include <LibGUI/GLabel.h>
Expand Down Expand Up @@ -271,15 +272,40 @@ void Field::reset()
set_updates_enabled(true);
}

void Field::flood_mark(Square& square)
{
if (square.is_swept)
return;
if (square.has_flag)
return;
if (square.is_considering)
return;
update();
square.is_swept = true;
square.button->set_visible(false);
square.label->set_visible(true);

--m_unswept_empties;

if (!m_unswept_empties)
win();
}

void Field::flood_fill(Square& square)
{
on_square_clicked(square);
square.for_each_neighbor([this](auto& neighbor) {
if (!neighbor.is_swept && !neighbor.has_mine && neighbor.number == 0)
flood_fill(neighbor);
if (!neighbor.has_mine && neighbor.number)
on_square_clicked(neighbor);
});
DoublyLinkedList<Square*> queue;
queue.append(&square);

for (auto s : queue) {
s->for_each_neighbor([this, &queue](Square& neighbor) {
if (!neighbor.is_swept && !neighbor.has_mine && neighbor.number == 0) {
flood_mark(neighbor);
queue.append(&neighbor);
}
if (!neighbor.has_mine && neighbor.number)
flood_mark(neighbor);
});
}
}

void Field::paint_event(GPaintEvent& event)
Expand Down
1 change: 1 addition & 0 deletions Games/Minesweeper/Field.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class Field final : public GFrame {
const Square& square(int row, int column) const { return *m_squares[row * columns() + column]; }

void flood_fill(Square&);
void flood_mark(Square&);

template<typename Callback>
void for_each_square(Callback);
Expand Down

0 comments on commit 77cb83b

Please sign in to comment.