X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fmap.c;h=8ed37d9b50cbd017baf0cb2c0464e5e547aebeab;hb=638cd257e1a56ad1702f4ac16b0228251ea8d056;hp=1c9a2f1881fdbac990dcd48ffe3bc9232aaa479d;hpb=0438f2fc5df337e4264103a86c1765ace9c6565a;p=plomrogue diff --git a/src/server/map.c b/src/server/map.c index 1c9a2f1..8ed37d9 100644 --- a/src/server/map.c +++ b/src/server/map.c @@ -2,6 +2,7 @@ #include "map.h" #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 */ @@ -136,13 +137,16 @@ static void make_trees() -extern void init_map() +extern void remake_map() { - char * f_name = "init_map()"; - world.map.cells = try_malloc(world.map.length * world.map.length, 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; } @@ -156,10 +160,3 @@ extern uint8_t is_passable(struct yx_uint8 pos) } return passable; } - - - -extern uint16_t yx_to_map_pos(struct yx_uint8 * yx) -{ - return (yx->y * world.map.length) + yx->x; -}