X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Ffield_of_view.c;h=8a162d8020c45579e250c9a6c58a14cc64204fff;hb=bf396f111317663bba3950e57968af19f2f56a44;hp=86eab2a3419ec52aae9257736b3126fb63a94375;hpb=dd13f9bebb48152163cef2f423423f64dfc7245a;p=plomrogue

diff --git a/src/server/field_of_view.c b/src/server/field_of_view.c
index 86eab2a..8a162d8 100644
--- a/src/server/field_of_view.c
+++ b/src/server/field_of_view.c
@@ -1,6 +1,12 @@
-/* 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 <math.h> /* pow() */
 #include <stddef.h> /* NULL */
 #include <stdint.h> /* uint8_t, uint16_t, uint32_t, int32_t, UINT8_MAX */
 #include <stdlib.h> /* free() */
@@ -8,7 +14,8 @@
 #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 "rrand.h" /* rrand() */
 #include "things.h" /* Thing, ThingInMemory, add_thing_to_memory_map() */
 #include "world.h" /* world  */
 
@@ -70,10 +77,10 @@ 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.
+/* Update "t_eye"'s things-on-map memory by removing from its .t_mem all
+ * memorized thing in FOV, and adding inanimate things in FOV to it.
  */
-static void update_map_memory(struct Thing * t, uint32_t map_size);
+static void add_things_to_map_memory(struct Thing * t_eye);
 
 
 
@@ -262,21 +269,8 @@ 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)
+static void add_things_to_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);
-    }
-    uint32_t i;
-    for (i = 0; i < map_size; i++)
-    {
-        if (' ' == t_eye->mem_map[i] && t_eye->fov_map[i] == 'v')
-        {
-            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;
@@ -311,6 +305,39 @@ 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)
+    {
+        init_empty_map(&(t_eye->mem_map));
+    }
+    if (!t_eye->mem_depth_map)
+    {
+        init_empty_map(&(t_eye->mem_depth_map));
+    }
+    uint32_t i;
+    for (i = 0; i < (uint32_t) (world.map.length * world.map.length); i++)
+    {
+        if ('v' == t_eye->fov_map[i])
+        {
+            t_eye->mem_depth_map[i] = '0';
+            if (' ' == t_eye->mem_map[i])
+            {
+                t_eye->mem_map[i] = world.map.cells[i];
+            }
+            continue;
+        }
+        if (   '0' <= t_eye->mem_depth_map[i] && '9' > t_eye->mem_depth_map[i]
+            && !(rrand() % (uint16_t) pow(2, t_eye->mem_depth_map[i] - 48)))
+        {
+            t_eye->mem_depth_map[i]++;
+        }
+    }
+    add_things_to_map_memory(t_eye);
+}
+
+
+
 extern void build_fov_map(struct Thing * t)
 {
     uint32_t map_size = world.map.length * world.map.length;
@@ -347,5 +374,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);
 }