X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fmap.c;h=3a5a0a213d1c6f8f644739f1410a0778bb66a9fa;hb=2abda4a2cf9ab42970b5fda00a433c7bcdb0f16e;hp=52a9b0b7d11bdefafc9d4d7b3580101d69073ced;hpb=639a12151eeb7ce0d18de330b4bb8d9d8094c4d3;p=plomrogue diff --git a/src/server/map.c b/src/server/map.c index 52a9b0b..3a5a0a2 100644 --- a/src/server/map.c +++ b/src/server/map.c @@ -1,15 +1,25 @@ -/* src/server/map.c */ +/* src/server/map.c + * + * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3 + * or any later version. For details on its copyright, license, and warranties, + * see the file NOTICE in the root directory of the PlomRogue source package. + */ #include "map.h" -#include /* uint8_t, uint16_t, uint32_t, UINT16_MAX */ +#include /* uint8_t, int8_t, uint16_t, uint32_t, (U)INT*_(MIN|MAX) */ +#include /* free() */ +#include /* memset() */ #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 */ +/* Helper to mv_yx_in_dir_legal(). Move "yx" into hex direction "d". */ +static void mv_yx_in_dir(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. @@ -30,6 +40,40 @@ static void make_trees(); +static void mv_yx_in_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 iter_limit(uint8_t init) { static uint32_t i = 0; @@ -50,20 +94,20 @@ 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; + 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.size.x + ind]) - || ( pos.x < world.map.size.x - 1 + && 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.size.y - 1 && diag_east - && type == world.map.cells[pos_i + world.map.size.x + ind]) + || ( 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.size.x - !ind]) + && type == world.map.cells[pos_i - world.map.length - !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])) + || ( pos.y < world.map.length - 1 && diag_west + && type == world.map.cells[pos_i + world.map.length - !ind])) { return 1; } @@ -75,11 +119,11 @@ static uint8_t is_neighbor(struct yx_uint8 pos, char type) static void make_sea() { uint16_t y, x; - for (y = 0; y < world.map.size.y; y++) + 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++); } } @@ -88,20 +132,20 @@ static void make_sea() static void make_island() { char type = '.'; - uint8_t add_half_width = !(world.map.size.y % 2) * (world.map.size.x / 2); - uint32_t size = world.map.size.x * world.map.size.y; + 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.size.y; - pos.x = rrand() % world.map.size.x; - uint16_t pos_i = (pos.y * world.map.size.x) + pos.x; + 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 ( pos.y == 0 || pos.y == world.map.size.y - 1 - || pos.x == 0 || pos.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; } @@ -116,15 +160,15 @@ 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 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.size.y; - pos.x = rrand() % world.map.size.x; - uint16_t pos_i = (pos.y * world.map.size.x) + pos.x; + 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))) { @@ -136,31 +180,62 @@ static void make_trees() -extern void init_map() +extern void remake_map() { - char * f_name = "init_map()"; - world.map.cells = try_malloc(world.map.size.x * world.map.size.y, f_name); + 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) +extern uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx) { - uint8_t passable = 0; - if (pos.x < world.map.size.x && pos.y < world.map.size.y) + 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; + } + char * err = "Too much wrapping in mv_yx_in_dir_legal()."; + exit_err( INT8_MIN == wrap_west_east || INT8_MIN == wrap_north_south + || INT8_MAX == wrap_west_east || INT8_MAX == wrap_north_south,err); + struct yx_uint8 original = *yx; + mv_yx_in_dir(dir, yx); + if (('e' == dir || 'd' == dir || 'c' == dir) && yx->x < original.x) + { + wrap_west_east++; + } + else if (('x' == dir || 's' == dir || 'w' == dir) && yx->x > original.x) + { + wrap_west_east--; + } + if (('w' == dir || 'e' == dir) && yx->y > original.y) + { + wrap_north_south--; + } + else if (('x' == dir || 'c' == dir) && yx->y < original.y) + { + wrap_north_south++; + } + if ( !wrap_west_east && !wrap_north_south + && 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; } -extern uint16_t yx_to_map_pos(struct yx_uint8 * yx) +extern void init_empty_map(char ** map) { - return (yx->y * world.map.size.x) + yx->x; + *map = try_malloc(world.map.length * world.map.length, __func__); + memset(*map, ' ', world.map.length * world.map.length); } -