Field: Ensure that the first cell has no mine

Closes #3.
UrFU-Programming · Jan 28, 2020 · 1e44736 · 1e44736
1 parent b430dba
commit 1e44736
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Cell.cpp b/Cell.cpp
@@ -45,7 +45,7 @@ void Cell::open()
     m_open = true;
 
     if (!m_field->isGenerated()) {
-        m_field->generate();
+        m_field->generate(x(), y());
     }
 
     if (minesAround() == 0) {

diff --git a/Field.cpp b/Field.cpp
@@ -38,7 +38,7 @@ void Field::prepare()
     }
 }
 
-void Field::generate()
+void Field::generate(int x, int y)
 {
     m_generated = true;
 
@@ -47,6 +47,10 @@ void Field::generate()
     while (minesToPlace > 0) {
         Cell *cell = m_cells.at(qrand() % m_cells.count());
 
+        if (cell->x() == x && cell->y() == y) {
+            continue;
+        }
+
         if (cell->haveMine()) {
             continue;
         }

diff --git a/Field.hpp b/Field.hpp
@@ -16,7 +16,7 @@ class Field
     void setNumberOfMines(int number);
 
     void prepare();
-    void generate();
+    void generate(int x, int y);
 
     int width() const { return m_width; }
     int height() const { return m_height; }