#include <string.h> /* memset() */
#include "../common/rexit.h" /* exit_trouble() */
#include "../common/try_malloc.h" /* try_malloc() */
+#include "../common/yx_uint8.h" /* yx_uint8 */
+#include "map.h" /* mv_yx_in_dir_legal() */
#include "things.h" /* Thing, ThingInMemory, add_thing_to_memory_map() */
-#include "yx_uint8.h" /* yx_uint8 */
#include "world.h" /* world */
-/* Move "yx" into hex direction "d". */
-static void mv_yx_in_hex_dir(char d, struct yx_uint8 * yx);
-
-/* Move "yx" into hex direction "d". If this moves "yx" beyond the minimal (0)
- * or maximal (UINT8_MAX) column or row, it wraps to the opposite side. Such
- * wrapping is returned as a wraps enum value and stored, so that further calls
- * to move "yx" back into the opposite direction may unwrap it again. Pass an
- * "unwrap" of !0 to re-set the internal wrap memory to 0.
- */
-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.
- */
-static uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx);
-
/* Recalculate angle < 0 or > CIRCLE to a value between these two limits. */
static uint32_t correct_angle(int32_t angle);
-static void mv_yx_in_hex_dir(char d, struct yx_uint8 * yx)
-{
- if (d == 'e')
- {
- yx->x = yx->x + (yx->y % 2);
- yx->y--;
- }
- else if (d == 'd')
- {
- yx->x++;
- }
- else if (d == 'c')
- {
- yx->x = yx->x + (yx->y % 2);
- yx->y++;
- }
- else if (d == 'x')
- {
- yx->x = yx->x - !(yx->y % 2);
- yx->y++;
- }
- else if (d == 's')
- {
- yx->x--;
- }
- else if (d == 'w')
- {
- yx->x = yx->x - !(yx->y % 2);
- yx->y--;
- }
-}
-
-
-
-static uint8_t mv_yx_in_dir_wrap(char d, struct yx_uint8 * yx, uint8_t unwrap)
-{
- static int8_t wrap_west_east = 0;
- static int8_t wrap_north_south = 0;
- if (unwrap)
- {
- wrap_west_east = wrap_north_south = 0;
- return 0;
- }
- struct yx_uint8 original;
- original.y = yx->y;
- original.x = yx->x;
- mv_yx_in_hex_dir(d, yx);
- if (strchr("edc", d) && yx->x < original.x)
- {
- wrap_west_east++;
- }
- else if (strchr("xsw", d) && yx->x > original.x)
- {
- wrap_west_east--;
- }
- if (strchr("we", d) && yx->y > original.y)
- {
- wrap_north_south--;
- }
- else if (strchr("xc", d) && yx->y < original.y)
- {
- wrap_north_south++;
- }
- return (wrap_west_east != 0) + (wrap_north_south != 0);
-}
-
-
-
-static uint8_t mv_yx_in_dir_legal(char dir, struct yx_uint8 * yx)
-{
- uint8_t wraptest = mv_yx_in_dir_wrap(dir, yx, 0);
- if (!wraptest && yx->x < world.map.length && yx->y < world.map.length)
- {
- return 1;
- }
- return 0;
-}
-
-
-
static uint32_t correct_angle(int32_t angle)
{
while (angle < 0)
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)
+ circle_is_on_map = 0;
+ if (1 != circle_i)
{
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++)
+ char dir_char = 'd';
+ uint8_t dir_char_pos_in_circledirs_string = 0;
+ uint16_t dist_i, hex_i;
+ for (hex_i = 0, dist_i = 1; hex_i < 6 * circle_i; dist_i++, hex_i++)
{
- if (mv_yx_in_dir_legal(dir, &test_pos))
+ if (mv_yx_in_dir_legal(dir_char, &test_pos))
{
- eval_position(dist, hex_i, t->fov_map, &test_pos, &shadows);
- circle_on_map = 1;
+ eval_position(circle_i, hex_i, t->fov_map, &test_pos, &shadows);
+ circle_is_on_map = 1;
}
- dir = circle_dirs[i_dir];
- if (dist == i_dist)
+ dir_char = circledirs_string[dir_char_pos_in_circledirs_string];
+ if (circle_i == dist_i)
{
- i_dist = 0;
- i_dir++;
+ dist_i = 0;
+ dir_char_pos_in_circledirs_string++;
}
}
}
- mv_yx_in_dir_wrap(0, NULL, 1);
+ mv_yx_in_dir_legal(0, NULL);
free_angles(shadows);
update_map_memory(t, map_size);
}