X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fserver%2Ffield_of_view.c;h=d6b3a8d1278124c6de9694823a416cb1c24b2663;hb=eda9c448812827e36b71fa1c3eb76d0fb906b57d;hp=86eab2a3419ec52aae9257736b3126fb63a94375;hpb=dd13f9bebb48152163cef2f423423f64dfc7245a;p=plomrogue
diff --git a/src/server/field_of_view.c b/src/server/field_of_view.c
index 86eab2a..d6b3a8d 100644
--- a/src/server/field_of_view.c
+++ b/src/server/field_of_view.c
@@ -1,4 +1,9 @@
-/* src/server/field_of_view.c */
+/* src/server/field_of_view.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 "field_of_view.h"
#include /* NULL */
@@ -8,7 +13,7 @@
#include "../common/rexit.h" /* exit_trouble() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* yx_uint8 */
-#include "map.h" /* mv_yx_in_dir_legal() */
+#include "map.h" /* mv_yx_in_dir_legal(), init_empty_map() */
#include "things.h" /* Thing, ThingInMemory, add_thing_to_memory_map() */
#include "world.h" /* world */
@@ -70,11 +75,6 @@ static void eval_position(uint16_t dist, uint16_t hex_i, char * fov_map,
struct yx_uint8 * test_pos,
struct shadow_angle ** shadows);
-/* Update "t"'s .mem_map memory with what's in its current FOV, remove from its
- * .t_mem all memorized things in FOV and add inanimiate things in FOV to it.
- */
-static void update_map_memory(struct Thing * t, uint32_t map_size);
-
static uint32_t correct_angle(int32_t angle)
@@ -262,15 +262,14 @@ static void eval_position(uint16_t dist, uint16_t hex_i, char * fov_map,
-static void update_map_memory(struct Thing * t_eye, uint32_t map_size)
+extern void update_map_memory(struct Thing * t_eye)
{
if (!t_eye->mem_map)
{
- t_eye->mem_map = try_malloc(map_size, __func__);
- memset(t_eye->mem_map, ' ', map_size);
+ init_empty_map(&(t_eye->mem_map));
}
uint32_t i;
- for (i = 0; i < map_size; i++)
+ for (i = 0; i < (uint32_t) (world.map.length * world.map.length); i++)
{
if (' ' == t_eye->mem_map[i] && t_eye->fov_map[i] == 'v')
{
@@ -347,5 +346,4 @@ extern void build_fov_map(struct Thing * t)
}
mv_yx_in_dir_legal(0, NULL);
free_angles(shadows);
- update_map_memory(t, map_size);
}