-/* 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 <stdint.h> /* uint8_t, uint16_t, uint32_t, int32_t */
+#include <stddef.h> /* NULL */
+#include <stdint.h> /* uint8_t, uint16_t, uint32_t, int32_t, UINT8_MAX */
#include <stdlib.h> /* free() */
#include <string.h> /* memset() */
#include "../common/rexit.h" /* exit_trouble() */
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.
- */
-static void update_map_memory(struct Thing * t, uint32_t map_size);
-
static uint32_t correct_angle(int32_t angle)
-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)
{
- t_eye->mem_map = try_malloc(map_size, __func__);
- memset(t_eye->mem_map, ' ', map_size);
+ t_eye->mem_map = try_malloc(world.map.length*world.map.length,__func__);
+ memset(t_eye->mem_map, ' ', world.map.length * world.map.length);
}
uint32_t i;
- for (i = 0; i < map_size; 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')
{
for (circle_i = 1, circle_is_on_map = 1; circle_is_on_map; circle_i++)
{
circle_is_on_map = 0;
- if (1 != circle_i)
- {
- mv_yx_in_dir_legal('c', &test_pos);
- }
- char dir_char = 'd';
- uint8_t dir_char_pos_in_circledirs_string = 0;
+ if (1 < circle_i) /* All circles but the 1st are */
+ { /* moved into starting from a */
+ mv_yx_in_dir_legal('c', &test_pos);/* previous circle's last hex, */
+ } /* i.e. from the upper left. */
+ char dir_char = 'd'; /* Circle's 1st hex is entered by rightward move.*/
+ uint8_t dir_char_pos_in_circledirs_string = UINT8_MAX;
uint16_t dist_i, hex_i;
- for (hex_i = 0, dist_i = 1; hex_i < 6 * circle_i; dist_i++, hex_i++)
+ for (hex_i=0, dist_i=circle_i; hex_i < 6 * circle_i; dist_i++, hex_i++)
{
+ if (circle_i < dist_i)
+ {
+ dist_i = 1;
+ dir_char=circledirs_string[++dir_char_pos_in_circledirs_string];
+ }
if (mv_yx_in_dir_legal(dir_char, &test_pos))
{
eval_position(circle_i, hex_i, t->fov_map, &test_pos, &shadows);
circle_is_on_map = 1;
}
- dir_char = circledirs_string[dir_char_pos_in_circledirs_string];
- if (circle_i == dist_i)
- {
- dist_i = 0;
- dir_char_pos_in_circledirs_string++;
- }
}
}
mv_yx_in_dir_legal(0, NULL);
free_angles(shadows);
- update_map_memory(t, map_size);
}