X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Ffield_of_view.c;h=440c84c2d6bea8a050673b30a7f3ff4a1321a5fc;hb=bfcf7850e4f5aa11ae5a33d78e153075032ff76d;hp=177143a26389758d053f93d3121321f453eb29dc;hpb=b4e81c08c1b229cac545f38a8f1fc3c08da91d83;p=plomrogue
diff --git a/src/server/field_of_view.c b/src/server/field_of_view.c
index 177143a..440c84c 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 */
@@ -42,8 +41,8 @@ static void mv_yx_in_hex_dir(char d, struct yx_uint8 * yx);
*/
static uint8_t mv_yx_in_dir_wrap(char d, struct yx_uint8 * yx, uint8_t unwrap);
-/* Wrapper to "mv_yx_in_dir_wrap()", returns 1 if the wrapped function moved
- * "yx" within the wrap borders and the map size, else 0.
+/* Wrapper to mv_yx_in_dir_wrap(), returns 1 if the wrapped function moved "yx"
+ * within the wrap borders and the map size, else 0.
*/
static uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx);
@@ -255,7 +254,6 @@ static void set_shadow(uint32_t left_angle, uint32_t right_angle,
struct shadow_angle ** shadows, uint16_t pos_in_map,
uint8_t * fov_map)
{
- char * f_name = "set_shadow()";
struct shadow_angle * shadow_i;
if (fov_map[pos_in_map] & VISIBLE)
{
@@ -274,7 +272,7 @@ static void set_shadow(uint32_t left_angle, uint32_t right_angle,
if (!try_merging_angles(left_angle, right_angle, shadows))
{
struct shadow_angle * shadow;
- shadow = try_malloc(sizeof(struct shadow_angle), f_name);
+ shadow = try_malloc(sizeof(struct shadow_angle), __func__);
shadow->left_angle = left_angle;
shadow->right_angle = right_angle;
shadow->next = NULL;
@@ -318,7 +316,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)
{
@@ -329,13 +327,12 @@ static void eval_position(uint16_t dist, uint16_t hex_i, uint8_t * fov_map,
-extern uint8_t * build_fov_map(struct Thing * eye)
+extern void build_fov_map(struct Thing * t)
{
- char * f_name = "build_fov_map()";
uint32_t map_size = world.map.length * world.map.length;
- uint8_t * fov_map = try_malloc(map_size, f_name);
- 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;
@@ -353,7 +350,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];
@@ -366,5 +363,4 @@ extern uint8_t * build_fov_map(struct Thing * eye)
}
mv_yx_in_dir_wrap(0, NULL, 1);
free_angles(shadows);
- return fov_map;
}