mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-22 10:59:51 +03:00
Minesweeper: make Field::flood_fill iterative
This change uses an iterative traversal to avoid stack overflows in, the previously recursive, flood_fill.
This commit is contained in:
parent
7cf4706a85
commit
77cb83b629
Notes:
sideshowbarker
2024-07-19 13:00:02 +09:00
Author: https://github.com/DrewStratford Commit: https://github.com/SerenityOS/serenity/commit/77cb83b629c Pull-request: https://github.com/SerenityOS/serenity/pull/379 Reviewed-by: https://github.com/awesomekling
@ -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>
|
||||
@ -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)
|
||||
|
@ -67,6 +67,7 @@ private:
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user