X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Fserver%2Fio.c;h=d28eeb65da99372f6f583af963bc9363d22f77c2;hb=6a9f579e2c47c5d60b37d343465e08faf26a9255;hp=227be3fd4e192a4886c29617771cc2637a245696;hpb=5826d08f8d4f8e9346a381d054e7cda473a947f9;p=plomrogue diff --git a/src/server/io.c b/src/server/io.c index 227be3f..d28eeb6 100644 --- a/src/server/io.c +++ b/src/server/io.c @@ -13,7 +13,7 @@ #include /* uint8_t, uint16_t, uint32_t, UINT8_MAX */ #include /* defines FILE, sprintf(), fprintf() */ #include /* free() */ -#include /* strlen(), snprintf(), memcpy(), memset(), strchr() */ +#include /* strlen(), snprintf(), memcpy(), strchr() */ #include /* time_t */ #include /* time(), nanosleep() */ #include "../common/readwrite.h" /* atomic_write_start(), atomic_write_finish(), @@ -24,6 +24,7 @@ #include "../common/try_malloc.h" /* try_malloc() */ #include "cleanup.h" /* set_cleanup_flag() */ #include "hardcoded_strings.h" /* s */ +#include "map.h" /* init_empty_map() */ #include "run.h" /* send_to_outfile() */ #include "things.h" /* Thing, ThingType, ThingInMemory, ThingAction, * get_thing_type(), get_player() @@ -262,13 +263,12 @@ static void write_inventory(struct Thing * player, FILE * file) static char * build_visible_map(struct Thing * player) { - uint32_t map_size = world.map.length * world.map.length; - char * visible_map = try_malloc(map_size, __func__); - memset(visible_map, ' ', map_size); + char * visible_map; + init_empty_map(&visible_map); if (player->fov_map) /* May fail if player thing was created / positioned */ { /* by god command after turning off FOV building. */ - uint32_t pos_i; - for (pos_i = 0; pos_i < map_size; pos_i++) + uint32_t pos_i = 0; + for (; pos_i < (uint32_t) world.map.length * world.map.length; pos_i++) { if (player->fov_map[pos_i] == 'v') {