@@ -10,7 +10,7 @@ Features:

     -   Hunt And Kill

         -   Handles mazes of any size

         -   Random with seed (time in seconds since the epoch by default)

-        -   Fairly slow (1000*1000 cells in ~4000ms)

+        -   Fairly fast (10000*10000 cells in ~1200ms)

 [`cxx-maze`]: https://git.rcrnstn.net/rcrnstn/cxx-maze

@@ -19,7 +19,7 @@ Features:

 ```

 $ make

 $ ./maze dummy

-3844ms

+1264ms

 $ ./maze

 ██  ████████████████████████████████████████████████████████████████████████████

 ██  ██                          ██              ██      ██          ██      ████

@@ -56,8 +56,8 @@ Maze hunt_and_kill(int w, int h, unsigned seed, C callback = [](Maze &){})

     // Entrance.

     maze(1, 0) = maze(1, 1) = Maze::PATH;

     // Interior.

-    auto cx = 1;

-    auto cy = 1;

+    auto cx = 1; auto rx = 1;

+    auto cy = 1; auto ry = 1;

     auto done = false;

     while (!done)

     {

@@ -86,19 +86,21 @@ Maze hunt_and_kill(int w, int h, unsigned seed, C callback = [](Maze &){})

             continue;

         }

         // No neighbors, done unless there's an uncarved cell to restart at.

-        done = true;

-        for (auto ry = 1; ry < h && done; ry += 2)

-        for (auto rx = 1; rx < w && done; rx += 2)

-            if (maze(rx, ry) == Maze::WALL)

-                for (auto ny = -2; ny <= 2 && done; ny += 2)

-                for (auto nx = -2; nx <= 2 && done; nx += 2)

-                    if (!nx != !ny)

-                    if (maze(rx+nx, ry+ny) == Maze::PATH)

-                    {

-                        cx = rx+nx;

-                        cy = ry+ny;

-                        done = false;

-                    }

+        done = [&]() {

+            for (; ry < h; ry += 2, rx = 1)

+            for (; rx < w; rx += 2)

+                if (maze(rx, ry) == Maze::WALL)

+                    for (auto ny = -2; ny <= 2; ny += 2)

+                    for (auto nx = -2; nx <= 2; nx += 2)

+                        if (!nx != !ny)

+                        if (maze(rx+nx, ry+ny) == Maze::PATH)

+                        {

+                            cx = rx+nx;

+                            cy = ry+ny;

+                            return false;

+                        }

+            return true;

+        }();

     }

     // Exit.

     w -= (w + 1) % 2;

@@ -121,7 +123,7 @@ int main(int argc, char const * [])

     else

     {

         auto const t1 = steady_clock::now();

-        hunt_and_kill(1000, 1000, 0);

+        hunt_and_kill(10000, 10000, 0);

         auto const t2 = steady_clock::now();

         std::cout << duration_cast<milliseconds>(t2 - t1).count() << "ms\n";

     }