X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Ffield_of_view.c;h=f14fffd1c11b090057dd707d94f93ec6383d2508;hb=c8841380b53dbd999061a8de399e71d5d8272fb0;hp=1a9acd588654f6d44b523ff18180a2201493fab9;hpb=61d2bf27904c05c2bb6dd68bd83cab9bba9c9385;p=plomrogue diff --git a/src/server/field_of_view.c b/src/server/field_of_view.c index 1a9acd5..f14fffd 100644 --- a/src/server/field_of_view.c +++ b/src/server/field_of_view.c @@ -84,6 +84,9 @@ static void eval_position(uint16_t dist, uint16_t hex_i, uint8_t * fov_map, struct yx_uint8 * test_pos, struct shadow_angle ** shadows); +/* Update "t"'s .mem_map memory with what's in its current field of view. */ +static void update_map_memory(struct Thing * t, uint32_t map_size); + static void mv_yx_in_hex_dir(char d, struct yx_uint8 * yx) @@ -327,12 +330,31 @@ static void eval_position(uint16_t dist, uint16_t hex_i, uint8_t * fov_map, -extern uint8_t * build_fov_map(struct Thing * eye) +static void update_map_memory(struct Thing * t, uint32_t map_size) +{ + if (!t->mem_map) + { + t->mem_map = try_malloc(map_size, __func__); + memset(t->mem_map, ' ', map_size); + } + uint32_t i; + for (i = 0; i < map_size; i++) + { + if (' ' == t->mem_map[i] && t->fov_map[i] & VISIBLE) + { + t->mem_map[i] = world.map.cells[i]; + } + } +} + + + +extern void build_fov_map(struct Thing * t) { uint32_t map_size = world.map.length * world.map.length; - uint8_t * fov_map = try_malloc(map_size, __func__); - memset(fov_map, VISIBLE, map_size); - struct yx_uint8 test_pos = eye->pos; + t->fov_map = t->fov_map ? t->fov_map : try_malloc(map_size, __func__); + memset(t->fov_map, VISIBLE, map_size); + struct yx_uint8 test_pos = t->pos; struct shadow_angle * shadows = NULL; char * circle_dirs = "xswedc"; uint16_t dist; @@ -350,7 +372,7 @@ extern uint8_t * build_fov_map(struct Thing * eye) { if (mv_yx_in_dir_legal(dir, &test_pos)) { - eval_position(dist, hex_i, fov_map, &test_pos, &shadows); + eval_position(dist, hex_i, t->fov_map, &test_pos, &shadows); circle_on_map = 1; } dir = circle_dirs[i_dir]; @@ -363,5 +385,5 @@ extern uint8_t * build_fov_map(struct Thing * eye) } mv_yx_in_dir_wrap(0, NULL, 1); free_angles(shadows); - return fov_map; + update_map_memory(t, map_size); }