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=7436f055854464194cc3fcdd429fb870f0382393;hpb=6489cfca32023a529f70960a089c73e282d73941;p=plomrogue
diff --git a/src/server/field_of_view.c b/src/server/field_of_view.c
index 7436f05..f14fffd 100644
--- a/src/server/field_of_view.c
+++ b/src/server/field_of_view.c
@@ -6,26 +6,17 @@
#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 */
-/* Number of degrees a circle is divided into. */
-#define CIRCLE 36000000
-
-
-
-/* Values for mv_yx_in_dir_wrap()'s wrapping directory memory. */
-enum wraps
-{
- WRAP_N = 0x01,
- WRAP_S = 0x02,
- WRAP_E = 0x04,
- WRAP_W = 0x08
-};
+/* Number of degrees a circle is divided into. The greater it is, the greater
+ * the angle precision. But make it one whole zero larger and bizarre FOV bugs
+ * appear on large maps, probably due to value overflows (TODO: more research!).
+ */
+#define CIRCLE 3600000
@@ -50,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);
@@ -93,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)
@@ -131,10 +125,11 @@ 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)
{
- static uint8_t wrap = 0;
+ static int8_t wrap_west_east = 0;
+ static int8_t wrap_north_south = 0;
if (unwrap)
{
- wrap = 0;
+ wrap_west_east = wrap_north_south = 0;
return 0;
}
struct yx_uint8 original;
@@ -143,21 +138,21 @@ static uint8_t mv_yx_in_dir_wrap(char d, struct yx_uint8 * yx, uint8_t unwrap)
mv_yx_in_hex_dir(d, yx);
if (strchr("edc", d) && yx->x < original.x)
{
- wrap = wrap & WRAP_W ? wrap ^ WRAP_W : wrap | WRAP_E;
+ wrap_west_east++;
}
else if (strchr("xsw", d) && yx->x > original.x)
{
- wrap = wrap & WRAP_E ? wrap ^ WRAP_E : wrap | WRAP_W;
+ wrap_west_east--;
}
if (strchr("we", d) && yx->y > original.y)
{
- wrap = wrap & WRAP_S ? wrap ^ WRAP_S : wrap | WRAP_N;
+ wrap_north_south--;
}
else if (strchr("xc", d) && yx->y < original.y)
{
- wrap = wrap & WRAP_N ? wrap ^ WRAP_N : wrap | WRAP_S;
+ wrap_north_south++;
}
- return wrap;
+ return (wrap_west_east != 0) + (wrap_north_south != 0);
}
@@ -262,7 +257,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)
{
@@ -281,7 +275,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;
@@ -325,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)
{
@@ -336,13 +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)
{
- 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;
@@ -360,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];
@@ -373,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);
}