Server: On map generation, put lots of 'X' cells for trees on island.

diff --git a/TODO b/TODO
index 5438e49d14ea3405bc32f498c6f1a05ca78dde78..c3c5b5fe2c2c65f9cbf5fbd333f07579fc34e264 100644 (file)
--- a/TODO
+++ b/TODO
@@ -25,3 +25,5 @@ CLIENT:
 - enable toggling of window borders
 
 - make log scrollable
+
+- fix buggy scrollling of large maps

diff --git a/src/server/map.c b/src/server/map.c
index 9f5b8669b762820738a905e061cb9f828fad911e..36c446580205e67041237c3e950c8441d62b6ac4 100644 (file)
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -10,11 +10,70 @@
 
 
 
-extern void init_map()
+/* 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 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)
+{
+    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;
+    uint16_t pos_i = (pos.y * world.map.size.x) + pos.x;
+    if (   (   pos.y > 0                    && diag_east
+            && type == world.map.cells[pos_i - world.map.size.x + ind])
+        || (   pos.x < world.map.size.x - 1
+            && type == world.map.cells[pos_i + 1])
+        || (   pos.y < world.map.size.y - 1 && diag_east
+            && type == world.map.cells[pos_i + world.map.size.x + ind])
+        || (   pos.y > 0                    && diag_west
+            && type == world.map.cells[pos_i - world.map.size.x - !ind])
+        || (   pos.x > 0
+            && type == world.map.cells[pos_i - 1])
+        || (   pos.y < world.map.size.y - 1 && diag_west
+            && type == world.map.cells[pos_i + world.map.size.x - !ind]))
+    {
+        return 1;
+    }
+    return 0;
+}
+
+
+
+static void make_sea()
 {
-    char * f_name = "init_map()";
-    uint32_t size = world.map.size.x * world.map.size.y;
-    world.map.cells = try_malloc(size, f_name);
     uint16_t y, x;
     for (y = 0; y < world.map.size.y; y++)
     {
@@ -22,46 +81,72 @@ extern void init_map()
              x < world.map.size.x;
              world.map.cells[(y * world.map.size.x) + x] = '~', x++);
     }
+}
+
+
+
+static void make_island()
+{
+    char type = '.';
     uint8_t add_half_width = !(world.map.size.y % 2) * (world.map.size.x / 2);
-    world.map.cells[(size / 2) + add_half_width] = '.';
+    uint32_t size = world.map.size.x * world.map.size.y;
+    world.map.cells[(size / 2) + add_half_width] = type;
     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))
+    iter_limit(1);
+    while (iter_limit(0))
     {
         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])))
+        uint16_t pos_i = (pos.y * world.map.size.x) + pos.x;
+        if ('~' == world.map.cells[pos_i] && is_neighbor(pos, type))
         {
             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[posi] = '.';
+            world.map.cells[pos_i] = type;
         }
     }
 }
 
 
 
+static void make_trees()
+{
+    char type = 'X';
+    struct yx_uint8 pos;
+    uint16_t n_trees = (world.map.size.x * world.map.size.y) / 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.size.y;
+        pos.x = rrand() % world.map.size.x;
+        uint16_t pos_i = (pos.y * world.map.size.x) + pos.x;
+        if ('.' == world.map.cells[pos_i]
+            && (!single_allowed || is_neighbor(pos, type)))
+        {
+            world.map.cells[pos_i] = type;
+            i_trees++;
+        }
+    }
+}
+
+
+
+extern void init_map()
+{
+    char * f_name = "init_map()";
+    world.map.cells = try_malloc(world.map.size.x * world.map.size.y, f_name);
+    make_sea();
+    make_island();
+    make_trees();
+}
+
+
+
 extern uint8_t is_passable(struct yx_uint8 pos)
 {
     uint8_t passable = 0;

diff --git a/src/server/map.h b/src/server/map.h
index e97a800ce4b1df0694a1bf2cafef56aa0abaa26c..45ddeaf3da448fb9ddbbd934c6d3b9474e8454d3 100644 (file)
--- a/src/server/map.h
+++ b/src/server/map.h
@@ -25,6 +25,7 @@ struct Map
  * cell in the middle, then going into a cycle of repeatedly selecting a random
  * seal cell and transforming it into land if it is neighbor to land; the cycle
  * ends when a land cell is due to be created right at the border of the map.
+ * Lots of 'X' cells representing trees are put on the island, too.
  */
 extern void init_map();