X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fmap.c;h=9f5b8669b762820738a905e061cb9f828fad911e;hb=6b1d36c9e673fd8f8595119080dca63a39ba483b;hp=8bae81a4a47b159233fbeb8d6a73fe6d296b06ab;hpb=d666ded12550cfc6fb50dd47e97b664ae82647a1;p=plomrogue

diff --git a/src/server/map.c b/src/server/map.c
index 8bae81a..9f5b866 100644
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -1,7 +1,8 @@
 /* src/server/map.c */
 
 #include "map.h"
-#include <stdint.h> /* uint8_t, uint16_t, uint32_t */
+#include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT16_MAX */
+#include "../common/rexit.h" /* exit_err() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "../common/yx_uint8.h" /* struct yx_uint8 */
 #include "rrand.h" /* rrand() */
@@ -23,29 +24,38 @@ extern void init_map()
     }
     uint8_t add_half_width = !(world.map.size.y % 2) * (world.map.size.x / 2);
     world.map.cells[(size / 2) + add_half_width] = '.';
-    uint16_t curpos;
-    while (1)
+    struct yx_uint8 pos;
+    uint16_t posi;
+    char * err = "Map generation reached iteration limit. Change map size?";
+    uint32_t i;
+    for (i = 0; ; i++, exit_err(256 * UINT16_MAX == i, err))
     {
-        y = rrand() % world.map.size.y;
-        x = rrand() % world.map.size.x;
-        curpos = (y * world.map.size.x) + x;
-        if ('~' == world.map.cells[curpos]
-            && (   (   curpos >= world.map.size.x
-                    && '.' == world.map.cells[curpos - world.map.size.x])
-                || (   curpos < world.map.size.x * (world.map.size.y-1)
-                    && '.' == world.map.cells[curpos + world.map.size.x])
-                || (   curpos > 0 && curpos % world.map.size.x != 0
-                    && '.' == world.map.cells[curpos-1])
-                || (   curpos < (world.map.size.x * world.map.size.y)
-                    && (curpos+1) % world.map.size.x != 0
-                    && '.' == world.map.cells[curpos+1])))
+        pos.y = rrand() % world.map.size.y;
+        pos.x = rrand() % world.map.size.x;
+        posi = (pos.y * world.map.size.x) + pos.x;
+        uint8_t ind = pos.y % 2;
+        uint8_t diag_west = pos.x + ind > 0;
+        uint8_t diag_east = pos.x + ind <= world.map.size.x - 1;
+        if ('~' == world.map.cells[posi]
+            && (   (   pos.y > 0                    && diag_east
+                    && '.' == world.map.cells[posi - world.map.size.x + ind])
+                || (   pos.x < world.map.size.x - 1
+                    && '.' == world.map.cells[posi + 1])
+                || (   pos.y < world.map.size.y - 1 && diag_east
+                    && '.' == world.map.cells[posi + world.map.size.x + ind])
+                || (   pos.y > 0                    && diag_west
+                    && '.' == world.map.cells[posi - world.map.size.x - !ind])
+                || (   pos.x > 0
+                    && '.' == world.map.cells[posi - 1])
+                || (   pos.y < world.map.size.y - 1 && diag_west
+                    && '.' == world.map.cells[posi + world.map.size.x - !ind])))
         {
-            if (   y == 0 || y == world.map.size.y - 1
-                || x == 0 || x == world.map.size.x - 1)
+            if (   pos.y == 0 || pos.y == world.map.size.y - 1
+                || pos.x == 0 || pos.x == world.map.size.x - 1)
             {
                 break;
             }
-            world.map.cells[y * world.map.size.x + x] = '.';
+            world.map.cells[posi] = '.';
         }
     }
 }
@@ -55,8 +65,7 @@ extern void init_map()
 extern uint8_t is_passable(struct yx_uint8 pos)
 {
     uint8_t passable = 0;
-    if (   0 <= pos.x && pos.x < world.map.size.x
-        && 0 <= pos.y && pos.y < world.map.size.y)
+    if (pos.x < world.map.size.x && pos.y < world.map.size.y)
     {
         passable = ('.' == world.map.cells[(pos.y * world.map.size.x) + pos.x]);
     }