X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Fmap.c;h=8ed37d9b50cbd017baf0cb2c0464e5e547aebeab;hb=535abca0a52631cd3f32aa8a8fb4012aa380e4df;hp=29beb1a03d5d0a6ebf1113d6ead1cd34763f2573;hpb=f9c94db47aa883149aa762fa128ac1ff1b3f92e1;p=plomrogue
diff --git a/src/server/map.c b/src/server/map.c
index 29beb1a..8ed37d9 100644
--- a/src/server/map.c
+++ b/src/server/map.c
@@ -1,7 +1,9 @@
/* src/server/map.c */
#include "map.h"
-#include /* uint8_t, uint16_t */
+#include /* uint8_t, uint16_t, uint32_t, UINT16_MAX */
+#include /* free() */
+#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() */
@@ -9,55 +11,152 @@
-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.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()
{
- 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++)
+ 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++);
+ x < world.map.length;
+ world.map.cells[(y * world.map.length) + x] = '~', x++);
}
- world.map.cells[size / 2 + (world.map.size.x / 2)] = '.';
- uint16_t curpos;
- while (1)
+}
+
+
+
+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))
{
- 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.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;
+ }
+ }
+}
+
+
+
+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 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.length && pos.y < world.map.length)
{
- passable = (('.' == world.map.cells[pos.y * world.map.size.x + pos.x]));
+ passable = ('.' == world.map.cells[(pos.y * world.map.length) + pos.x]);
}
return passable;
}