X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Ffield_of_view.c;h=f14fffd1c11b090057dd707d94f93ec6383d2508;hb=edebb2bf9aa780ee2f7006c1d2be9168564d34df;hp=278cc8b8d5b4a34c46f92319db35d0ddf9161b6b;hpb=1cb57a35a3b3cc4ec8870531ca254a655c0bdda2;p=plomrogue
diff --git a/src/server/field_of_view.c b/src/server/field_of_view.c
index 278cc8b..f14fffd 100644
--- a/src/server/field_of_view.c
+++ b/src/server/field_of_view.c
@@ -6,7 +6,6 @@
#include /* memset() */
#include "../common/rexit.h" /* exit_trouble() */
#include "../common/try_malloc.h" /* try_malloc() */
-#include "map.h" /* yx_to_map_pos() */
#include "things.h" /* Thing */
#include "yx_uint8.h" /* yx_uint8 */
#include "world.h" /* world */
@@ -85,6 +84,9 @@ static void eval_position(uint16_t dist, uint16_t hex_i, uint8_t * 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. */
+static void update_map_memory(struct Thing * t, uint32_t map_size);
+
static void mv_yx_in_hex_dir(char d, struct yx_uint8 * yx)
@@ -317,7 +319,7 @@ static void eval_position(uint16_t dist, uint16_t hex_i, uint8_t * fov_map,
uint32_t left_angle = correct_angle(left_angle_uncorrected);
uint32_t right_angle = correct_angle(right_angle_uncorrected);
uint32_t right_angle_1st = right_angle > left_angle ? 0 : right_angle;
- uint16_t pos_in_map = yx_to_map_pos(test_pos);
+ uint16_t pos_in_map = test_pos->y * world.map.length + test_pos->x;
set_shadow(left_angle, right_angle_1st, shadows, pos_in_map, fov_map);
if (right_angle_1st != right_angle)
{
@@ -328,12 +330,31 @@ static void eval_position(uint16_t dist, uint16_t hex_i, uint8_t * fov_map,
-extern uint8_t * build_fov_map(struct Thing * eye)
+static void update_map_memory(struct Thing * t, uint32_t map_size)
+{
+ if (!t->mem_map)
+ {
+ t->mem_map = try_malloc(map_size, __func__);
+ memset(t->mem_map, ' ', map_size);
+ }
+ uint32_t i;
+ for (i = 0; i < map_size; i++)
+ {
+ if (' ' == t->mem_map[i] && t->fov_map[i] & VISIBLE)
+ {
+ t->mem_map[i] = world.map.cells[i];
+ }
+ }
+}
+
+
+
+extern void build_fov_map(struct Thing * t)
{
uint32_t map_size = world.map.length * world.map.length;
- uint8_t * fov_map = try_malloc(map_size, __func__);
- memset(fov_map, VISIBLE, map_size);
- struct yx_uint8 test_pos = eye->pos;
+ t->fov_map = t->fov_map ? t->fov_map : try_malloc(map_size, __func__);
+ memset(t->fov_map, VISIBLE, map_size);
+ struct yx_uint8 test_pos = t->pos;
struct shadow_angle * shadows = NULL;
char * circle_dirs = "xswedc";
uint16_t dist;
@@ -351,7 +372,7 @@ extern uint8_t * build_fov_map(struct Thing * eye)
{
if (mv_yx_in_dir_legal(dir, &test_pos))
{
- eval_position(dist, hex_i, fov_map, &test_pos, &shadows);
+ eval_position(dist, hex_i, t->fov_map, &test_pos, &shadows);
circle_on_map = 1;
}
dir = circle_dirs[i_dir];
@@ -364,5 +385,5 @@ extern uint8_t * build_fov_map(struct Thing * eye)
}
mv_yx_in_dir_wrap(0, NULL, 1);
free_angles(shadows);
- return fov_map;
+ update_map_memory(t, map_size);
}