Server/AI: Check for visibility of enemies before building Djikstra map.

[plomrogue] / src / server / io.c

diff --git a/src/server/io.c b/src/server/io.c
index a89f1212c78f33200163a8bd1af7fb2a0339838a..947c1468b48711d998e875bb76924e6a0da3d03d 100644 (file)
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -1,6 +1,6 @@
 /* src/server/io.c */
 
-#define _POSIX_C_SOURCE 200112L
+#define _POSIX_C_SOURCE 200112L /* snrpintf() */
 #include "io.h"
 #include <errno.h> /* global errno */
 #include <limits.h> /* PIPE_BUF */
@@ -17,7 +17,6 @@
 #include "../common/rexit.h" /* exit_trouble() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "cleanup.h" /* set_cleanup_flag() */
-#include "field_of_view.h" /* VISIBLE */
 #include "hardcoded_strings.h" /* s */
 #include "things.h" /* Thing, ThingType, ThingAction, get_thing_type(),
                      * get_player()
@@ -309,7 +308,7 @@ static char * build_visible_map(struct Thing * player)
         uint32_t pos_i;
         for (pos_i = 0; pos_i < map_size; pos_i++)
         {
-            if (player->fov_map[pos_i] & VISIBLE)
+            if (player->fov_map[pos_i] == 'v')
             {
                 visible_map[pos_i] = world.map.cells[pos_i];
             }
@@ -322,8 +321,7 @@ static char * build_visible_map(struct Thing * player)
         {
             for (t = world.things; t != 0; t = t->next)
             {
-                if (   (  player->fov_map[t->pos.y * world.map.length +t->pos.x]
-                        & VISIBLE)
+                if (   'v'==player->fov_map[t->pos.y*world.map.length+t->pos.x]
                     && (   (0 == i && 0 == t->lifepoints)
                         || (1 == i && 0 < t->lifepoints)))
                 {