#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 */
/* Test whether angle between "left_angle" and "right_angle", or at least
* "middle_angle", is captured inside one of the shadow angles in "shadows". If
- * so, set hex in "fov_map" indexed by "pos_in_map" to HIDDEN. If the whole
- * angle and not just "middle_angle" is captured, return 1. Any other case: 0.
+ * so, set hex in "fov_map" indexed by "pos_in_map" to 'H'. If the whole angle
+ * and not just "middle_angle" is captured, return 1. Any other case: 0.
*/
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, uint8_t * fov_map);
-
-/* Test whether angle between "left_angle" and "right_angle", or at least
- * "middle_angle", is captured inside one of the shadow angles in "shadows". If
- * so, set hex in "fov_map" indexed by "pos_in_map" to HIDDEN. If the whole
- * angle and not just "middle_angle" is captured, return 1. Any other case: 0.
- */
-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, uint8_t * fov_map);
+ uint16_t pos_in_map, char * fov_map);
/* Free shadow angles list "angles". */
static void free_angles(struct shadow_angle * angles);
* the circle's rightmost point), for setting shaded hexes in "fov_map" and
* potentially adding a new shadow to linked shadow angle list "shadows".
*/
-static void eval_position(uint16_t dist, uint16_t hex_i, uint8_t * fov_map,
+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);
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, uint8_t * fov_map)
+ uint16_t pos_in_map, char * fov_map)
{
struct shadow_angle * shadow_i;
- if (fov_map[pos_in_map] & VISIBLE)
+ if (fov_map[pos_in_map] == 'v')
{
for (shadow_i = *shadows; shadow_i; shadow_i = shadow_i->next)
{
if ( left_angle <= shadow_i->left_angle
&& right_angle >= shadow_i->right_angle)
{
- fov_map[pos_in_map] = HIDDEN;
+ fov_map[pos_in_map] = 'H';
return 1;
}
if ( middle_angle < shadow_i->left_angle
&& middle_angle > shadow_i->right_angle)
{
- fov_map[pos_in_map] = HIDDEN;
+ fov_map[pos_in_map] = 'H';
}
}
}
-static void eval_position(uint16_t dist, uint16_t hex_i, uint8_t * fov_map,
+static void eval_position(uint16_t dist, uint16_t hex_i, char * fov_map,
struct yx_uint8 * test_pos,
struct shadow_angle ** shadows)
{
-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] & VISIBLE)
+ 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;
+ 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])
{
- t->mem_map[i] = world.map.cells[i];
+ add_thing_to_memory_map(t_eye, t->type, t->pos.y, t->pos.x);
}
}
}
{
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, VISIBLE, map_size);
+ memset(t->fov_map, 'v', map_size);
struct yx_uint8 test_pos = t->pos;
struct shadow_angle * shadows = NULL;
char * circle_dirs = "xswedc";
projects / plomrogue / blobdiff