Add to TODO.

[plomrogue] / src / server / field_of_view.c

diff --git a/src/server/field_of_view.c b/src/server/field_of_view.c
index ae8aa9cbaa0887dbde1478f07ac808f6bc525a1f..45f3108aafcb2a2f2be773d7e81d5f26aafdbd8f 100644 (file)
--- a/src/server/field_of_view.c
+++ b/src/server/field_of_view.c
@@ -6,7 +6,7 @@
 #include <string.h> /* memset() */
 #include "../common/rexit.h" /* exit_trouble() */
 #include "../common/try_malloc.h" /* try_malloc() */
-#include "things.h" /* Thing */
+#include "things.h" /* Thing, ThingInMemory, add_thing_to_memory_map() */
 #include "yx_uint8.h" /* yx_uint8 */
 #include "world.h" /* world  */
 
@@ -84,7 +84,9 @@ 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 field of view. */
+/* 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);
 
 
@@ -354,19 +356,49 @@ static void eval_position(uint16_t dist, uint16_t hex_i, char * fov_map,
 
 
 
-static void update_map_memory(struct Thing * t, uint32_t map_size)
+static void update_map_memory(struct Thing * t_eye, uint32_t map_size)
 {
-    if (!t->mem_map)
+    if (!t_eye->mem_map)
     {
-        t->mem_map = try_malloc(map_size, __func__);
-        memset(t->mem_map, ' ', map_size);
+        t_eye->mem_map = try_malloc(map_size, __func__);
+        memset(t_eye->mem_map, ' ', map_size);
     }
     uint32_t i;
     for (i = 0; i < map_size; i++)
     {
-        if (' ' == t->mem_map[i] && t->fov_map[i] == 'v')
+        if (' ' == t_eye->mem_map[i] && t_eye->fov_map[i] == 'v')
         {
-            t->mem_map[i] = world.map.cells[i];
+            t_eye->mem_map[i] = world.map.cells[i];
+        }
+    }
+    struct ThingInMemory * tm = t_eye->t_mem;
+    struct ThingInMemory * tm_prev = NULL;
+    struct ThingInMemory * tm_next = NULL;
+    for (; tm; tm = tm_next)
+    {
+        tm_next = tm->next;
+        if ('v' == t_eye->fov_map[tm->pos.y * world.map.length + tm->pos.x])
+        {
+            if (tm_prev)
+            {
+                tm_prev->next = tm->next;
+            }
+            else
+            {
+                t_eye->t_mem = tm->next;
+            }
+            free(tm);
+            continue;
+        }
+        tm_prev = tm;
+    }
+    struct Thing * t = world.things;
+    for (; t; t = t->next)
+    {
+        if (   !t->lifepoints
+            && 'v' == t_eye->fov_map[t->pos.y * world.map.length + t->pos.x])
+        {
+            add_thing_to_memory_map(t_eye, t->type, t->pos.y, t->pos.x);
         }
     }
 }
@@ -378,19 +410,19 @@ extern void build_fov_map(struct Thing * t)
     uint32_t map_size = world.map.length * world.map.length;
     t->fov_map = t->fov_map ? t->fov_map : try_malloc(map_size, __func__);
     memset(t->fov_map, 'v', map_size);
-    struct yx_uint8 test_pos = t->pos;
     struct shadow_angle * shadows = NULL;
+    struct yx_uint8 test_pos = t->pos;
     char * circle_dirs = "xswedc";
     uint16_t dist;
-    uint8_t first_round, circle_on_map;
-    for (first_round = 1, dist = 1, circle_on_map = 1; circle_on_map; dist++)
+    uint8_t circle_on_map;
+    for (dist = 1, circle_on_map = 1; circle_on_map; dist++)
     {
-        if (!first_round)
+        if (1 != dist)
         {
             mv_yx_in_dir_legal('c', &test_pos);
         }
         char dir = 'd';
-        uint8_t i_dir = first_round = circle_on_map = 0;
+        uint8_t i_dir = circle_on_map = 0;
         uint16_t i_dist, hex_i;
         for (hex_i = 0, i_dist = 1; hex_i < 6 * dist; i_dist++, hex_i++)
         {