-/* 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() */
memset(t->fov_map, 'v', map_size);
struct shadow_angle * shadows = NULL;
struct yx_uint8 test_pos = t->pos;
- char * circle_dirs = "xswedc";
- uint16_t dist;
- uint8_t circle_on_map;
- for (dist = 1, circle_on_map = 1; circle_on_map; dist++)
+ char * circledirs_string = "xswedc";
+ uint16_t circle_i;
+ uint8_t circle_is_on_map;
+ for (circle_i = 1, circle_is_on_map = 1; circle_is_on_map; circle_i++)
{
- if (1 != dist)
- {
- mv_yx_in_dir_legal('c', &test_pos);
- }
- char dir = 'd';
- uint8_t i_dir = circle_on_map = 0;
- uint16_t i_dist, hex_i;
- for (hex_i = 0, i_dist = 1; hex_i < 6 * dist; i_dist++, hex_i++)
+ circle_is_on_map = 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=circle_i; hex_i < 6 * circle_i; dist_i++, hex_i++)
{
- if (mv_yx_in_dir_legal(dir, &test_pos))
+ if (circle_i < dist_i)
{
- eval_position(dist, hex_i, t->fov_map, &test_pos, &shadows);
- circle_on_map = 1;
+ dist_i = 1;
+ dir_char=circledirs_string[++dir_char_pos_in_circledirs_string];
}
- dir = circle_dirs[i_dir];
- if (dist == i_dist)
+ if (mv_yx_in_dir_legal(dir_char, &test_pos))
{
- i_dist = 0;
- i_dir++;
+ eval_position(circle_i, hex_i, t->fov_map, &test_pos, &shadows);
+ circle_is_on_map = 1;
}
}
}