RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:47:44 +00:00
Code Issues Activity Actions

Minesweeper: refactor on_square_clicked and flood_mark

Browse source 
Both on_square_clicked and flood_mark were very similar so I've
introduced the on_square_clicked_impl function which is now
called by on_square_clicked and flood_fill.
This commit is contained in:
Drew Stratford 2019-07-30 03:46:21 +12:00 • committed by Andreas Kling
parent 6b757a152a
commit 80cb833594
2 changed files with 12 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Games/Minesweeper/Field.cpp
View file

@ -272,39 +272,20 @@ void Field::reset()
set_updates_enabled(true); 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) void Field::flood_fill(Square& square)
{ {
Queue<Square*> queue; Queue<Square*> queue;
queue.enqueue(&square); queue.enqueue(&square);
while(!queue.is_empty()) { while (!queue.is_empty()) {
Square *s = queue.dequeue(); Square* s = queue.dequeue();
s->for_each_neighbor([this, &queue](Square& neighbor) { s->for_each_neighbor([this, &queue](Square& neighbor) {
if (!neighbor.is_swept && !neighbor.has_mine && neighbor.number == 0) { if (!neighbor.is_swept && !neighbor.has_mine && neighbor.number == 0) {
flood_mark(neighbor); on_square_clicked_impl(neighbor, false);
queue.enqueue(&neighbor); queue.enqueue(&neighbor);
} }
if (!neighbor.has_mine && neighbor.number) if (!neighbor.has_mine && neighbor.number)
flood_mark(neighbor); on_square_clicked_impl(neighbor, false);
}); });
} }
} }
@ -330,7 +311,7 @@ void Field::paint_event(GPaintEvent& event)
} }
} }
void Field::on_square_clicked(Square& square) void Field::on_square_clicked_impl(Square& square, bool should_flood_fill)
{ {
if (m_first_click) { if (m_first_click) {
while (square.has_mine) { while (square.has_mine) {
@ -358,13 +339,18 @@ void Field::on_square_clicked(Square& square)
} }
--m_unswept_empties; --m_unswept_empties;
if (square.number == 0) if (should_flood_fill && square.number == 0)
flood_fill(square); flood_fill(square);
if (!m_unswept_empties) if (!m_unswept_empties)
win(); win();
} }
void Field::on_square_clicked(Square& square)
{
on_square_clicked_impl(square, true);
}
void Field::on_square_chorded(Square& square) void Field::on_square_chorded(Square& square)
{ {
if (!square.is_swept) if (!square.is_swept)

2
Games/Minesweeper/Field.h
View file

@ -67,7 +67,7 @@ private:
const Square& square(int row, int column) const { return *m_squares[row * columns() + column]; } const Square& square(int row, int column) const { return *m_squares[row * columns() + column]; }
void flood_fill(Square&); void flood_fill(Square&);
void flood_mark(Square&); void on_square_clicked_impl(Square&, bool);
template<typename Callback> template<typename Callback>
void for_each_square(Callback); void for_each_square(Callback);