X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fmap.c;h=4b49fa1b97d6e389787c08f2fc56f5410c1d3dee;hb=37382f424bcfc92dcb2ef291bcce3aca8aa0772a;hp=29beb1a03d5d0a6ebf1113d6ead1cd34763f2573;hpb=f9c94db47aa883149aa762fa128ac1ff1b3f92e1;p=plomrogue

diff --git a/src/server/map.c b/src/server/map.c
index 29beb1a..4b49fa1 100644
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -1,63 +1,239 @@
 /* src/server/map.c */
 
 #include "map.h"
-#include <stdint.h> /* uint8_t, uint16_t */
+#include <stdint.h> /* uint8_t, int8_t, uint16_t, uint32_t, UINT16_MAX */
+#include <stdlib.h> /* free() */
+#include <string.h> /* strchr() */
+#include "../common/rexit.h" /* exit_err() */
 #include "../common/try_malloc.h" /* try_malloc() */
-#include "../common/yx_uint8.h" /* struct yx_uint8 */
+#include "../common/yx_uint8.h" /* yx_uint8 */
 #include "rrand.h" /* rrand() */
 #include "world.h" /* global world */
 
 
 
-extern void init_map()
+/* Helper to mv_yx_in_dir_legal(). Move "yx" into hex direction "d". */
+static void mv_yx_in_hex_dir(char d, struct yx_uint8 * yx);
+
+/* Helper to mv_yx_in_dir_legal(). Move "yx" into hex direction "d", do wrapping
+ * logic, return 1 if "yx" ends outside of the original wrap space, else 0.
+ */
+static uint8_t mv_yx_in_dir_wrap(char d, struct yx_uint8 * yx);
+
+/* Call this too often with "init" of 0 and the game exits with an error message
+ * about reaching an iteration limit. An "init" of 1 sets the iteration counter
+ * to 0. Iteration limit is currently 256 * UINT16_MAX.
+ */
+static uint8_t iter_limit(uint8_t init);
+
+/* Return 1 if cell on "pos" is neighbor to a cell of "type", else return 0. */
+static uint8_t is_neighbor(struct yx_uint8 pos, char type);
+
+/* Fill map with '~' cells. */
+static void make_sea();
+
+/* Put island of '.' cells inside map sea. */
+static void make_sea();
+
+/* Put tree cells of 'X' on island. */
+static void make_trees();
+
+
+
+static void mv_yx_in_hex_dir(char d, struct yx_uint8 * yx)
+{
+    if     (d == 'e')
+    {
+        yx->x = yx->x + (yx->y % 2);
+        yx->y--;
+    }
+    else if (d == 'd')
+    {
+        yx->x++;
+    }
+    else if (d == 'c')
+    {
+        yx->x = yx->x + (yx->y % 2);
+        yx->y++;
+    }
+    else if (d == 'x')
+    {
+        yx->x = yx->x - !(yx->y % 2);
+        yx->y++;
+    }
+    else if (d == 's')
+    {
+        yx->x--;
+    }
+    else if (d == 'w')
+    {
+        yx->x = yx->x - !(yx->y % 2);
+        yx->y--;
+    }
+}
+
+
+
+static uint8_t mv_yx_in_dir_wrap(char d, struct yx_uint8 * yx)
+{
+    static int8_t wrap_west_east   = 0;
+    static int8_t wrap_north_south = 0;
+    if (!yx)
+    {
+        wrap_west_east = wrap_north_south = 0;
+        return 0;
+    }
+    struct yx_uint8 original;
+    original.y = yx->y;
+    original.x = yx->x;
+    mv_yx_in_hex_dir(d, yx);
+    if      (strchr("edc", d) && yx->x < original.x)
+    {
+        wrap_west_east++;
+    }
+    else if (strchr("xsw", d) && yx->x > original.x)
+    {
+        wrap_west_east--;
+    }
+    if      (strchr("we", d) && yx->y > original.y)
+    {
+        wrap_north_south--;
+    }
+    else if (strchr("xc", d) && yx->y < original.y)
+    {
+        wrap_north_south++;
+    }
+    return (wrap_west_east != 0) + (wrap_north_south != 0);
+}
+
+
+
+static uint8_t iter_limit(uint8_t init)
+{
+    static uint32_t i = 0;
+    char * err = "Map generation reached iteration limit. Change map size?";
+    if (init)
+    {
+        i = 0;
+        return 0;
+    }
+    i++;
+    exit_err(256 * UINT16_MAX == i, err);
+    return 1;
+}
+
+
+
+static uint8_t is_neighbor(struct yx_uint8 pos, char type)
 {
-    char * f_name = "init_map()";
-    uint16_t size = world.map.size.x * world.map.size.y;
-    world.map.cells = try_malloc(size, f_name);
-    uint8_t y, x;
-    for (y = 0; y < world.map.size.y; y++)
+    uint8_t ind = pos.y % 2;
+    uint8_t diag_west = pos.x + ind > 0;
+    uint8_t diag_east = pos.x + ind <= world.map.length - 1;
+    uint16_t pos_i = (pos.y * world.map.length) + pos.x;
+    if (   (   pos.y > 0                    && diag_east
+            && type == world.map.cells[pos_i - world.map.length + ind])
+        || (   pos.x < world.map.length - 1
+            && type == world.map.cells[pos_i + 1])
+        || (   pos.y < world.map.length - 1 && diag_east
+            && type == world.map.cells[pos_i + world.map.length + ind])
+        || (   pos.y > 0                    && diag_west
+            && type == world.map.cells[pos_i - world.map.length - !ind])
+        || (   pos.x > 0
+            && type == world.map.cells[pos_i - 1])
+        || (   pos.y < world.map.length - 1 && diag_west
+            && type == world.map.cells[pos_i + world.map.length - !ind]))
+    {
+        return 1;
+    }
+    return 0;
+}
+
+
+
+static void make_sea()
+{
+    uint16_t y, x;
+    for (y = 0; y < world.map.length; y++)
     {
         for (x = 0;
-             x < world.map.size.x;
-             world.map.cells[(y * world.map.size.x) + x] = '~', x++);
-    }
-    world.map.cells[size / 2 + (world.map.size.x / 2)] = '.';
-    uint16_t curpos;
-    while (1)
-    {
-        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])))
+             x < world.map.length;
+             world.map.cells[(y * world.map.length) + x] = '~', x++);
+    }
+}
+
+
+
+static void make_island()
+{
+    char type = '.';
+    uint8_t add_half_width = !(world.map.length % 2) * (world.map.length / 2);
+    uint32_t size = world.map.length * world.map.length;
+    world.map.cells[(size / 2) + add_half_width] = type;
+    struct yx_uint8 pos;
+    iter_limit(1);
+    while (iter_limit(0))
+    {
+        pos.y = rrand() % world.map.length;
+        pos.x = rrand() % world.map.length;
+        uint16_t pos_i = (pos.y * world.map.length) + pos.x;
+        if ('~' == world.map.cells[pos_i] && is_neighbor(pos, type))
         {
-            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.length - 1
+                || pos.x == 0 || pos.x == world.map.length - 1)
             {
                 break;
             }
-            world.map.cells[y * world.map.size.x + x] = '.';
+            world.map.cells[pos_i] = type;
         }
     }
 }
 
 
 
-extern uint8_t is_passable(struct yx_uint8 pos)
+static void make_trees()
+{
+    char type = 'X';
+    struct yx_uint8 pos;
+    uint16_t n_trees = (world.map.length * world.map.length) / 16;
+    uint16_t i_trees = 0;
+    iter_limit(1);
+    while (i_trees <= n_trees && iter_limit(0))
+    {
+        uint8_t single_allowed = rrand() % 32;
+        pos.y = rrand() % world.map.length;
+        pos.x = rrand() % world.map.length;
+        uint16_t pos_i = (pos.y * world.map.length) + pos.x;
+        if ('.' == world.map.cells[pos_i]
+            && (!single_allowed || is_neighbor(pos, type)))
+        {
+            world.map.cells[pos_i] = type;
+            i_trees++;
+        }
+    }
+}
+
+
+
+extern void remake_map()
+{
+    free(world.map.cells);
+    world.map.cells = try_malloc(world.map.length * world.map.length, __func__);
+    uint32_t store_seed = world.seed;
+    world.seed = world.seed_map;
+    make_sea();
+    make_island();
+    make_trees();
+    world.seed = store_seed;
+}
+
+
+
+extern uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx)
 {
-    uint8_t passable = 0;
-    if (   0 <= pos.x && pos.x < world.map.size.x
-        && 0 <= pos.y && pos.y < world.map.size.y)
+    uint8_t wraptest = mv_yx_in_dir_wrap(dir, yx);
+    if (yx && !wraptest && yx->x < world.map.length && yx->y < world.map.length)
     {
-        passable = (('.' == world.map.cells[pos.y * world.map.size.x + pos.x]));
+        return 1;
     }
-    return passable;
+    return 0;
 }