X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Ffield_of_view.c;h=dc60442e3ff28a835d462f5e3ca877b5c938fa2c;hb=a18ffcfc0b1527b5751ff9c76b8bdb7ee181a764;hp=d6b3a8d1278124c6de9694823a416cb1c24b2663;hpb=6a9f579e2c47c5d60b37d343465e08faf26a9255;p=plomrogue
diff --git a/src/server/field_of_view.c b/src/server/field_of_view.c
index d6b3a8d..dc60442 100644
--- a/src/server/field_of_view.c
+++ b/src/server/field_of_view.c
@@ -6,6 +6,7 @@
*/
#include "field_of_view.h"
+#include /* pow() */
#include /* NULL */
#include /* uint8_t, uint16_t, uint32_t, int32_t, UINT8_MAX */
#include /* free() */
@@ -14,6 +15,7 @@
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* yx_uint8 */
#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 */
@@ -63,6 +65,12 @@ static uint8_t shade_hex(uint32_t left_angle, uint32_t right_angle,
uint32_t middle_angle, struct shadow_angle ** shadows,
uint16_t pos_in_map, char * fov_map);
+/* To "shadows", add shadow defined by "left_angle" and "right_angle", either as
+ * new entry or as part of an existing shadow (swallowed whole or extending it).
+ */
+static void set_shadow(uint32_t left_angle, uint32_t right_angle,
+ struct shadow_angle ** shadows);
+
/* Free shadow angles list "angles". */
static void free_angles(struct shadow_angle * angles);
@@ -75,6 +83,11 @@ 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_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 add_things_to_map_memory(struct Thing * t_eye);
+
static uint32_t correct_angle(int32_t angle)
@@ -188,9 +201,6 @@ static uint8_t shade_hex(uint32_t left_angle, uint32_t right_angle,
-/* To "shadows", add shadow defined by "left_angle" and "right_angle", either as
- * new entry or as part of an existing shadow (swallowed whole or extending it).
- */
static void set_shadow(uint32_t left_angle, uint32_t right_angle,
struct shadow_angle ** shadows)
{
@@ -262,20 +272,8 @@ static void eval_position(uint16_t dist, uint16_t hex_i, char * fov_map,
-extern void update_map_memory(struct Thing * t_eye)
+static void add_things_to_map_memory(struct Thing * t_eye)
{
- if (!t_eye->mem_map)
- {
- init_empty_map(&(t_eye->mem_map));
- }
- uint32_t 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')
- {
- 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;
@@ -310,6 +308,39 @@ extern void update_map_memory(struct Thing * t_eye)
+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;