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

[plomrogue] / src / server / ai.c

diff --git a/src/server/ai.c b/src/server/ai.c
index 31bc55ce1e5ff1b61061270963edc8c6abd6d78a..9e317a18543ad769086473d3d899984aa7f3f8ac 100644 (file)
--- a/src/server/ai.c
+++ b/src/server/ai.c
@@ -5,7 +5,6 @@
 #include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT16_MAX */
 #include <stdlib.h> /* free() */
 #include "../common/try_malloc.h" /* try_malloc() */
-#include "field_of_view.h" /* VISIBLE */
 #include "hardcoded_strings.h" /* s */
 #include "thing_actions.h" /* get_thing_action_id_by_name() */
 #include "things.h" /* struct Thing */
@@ -27,13 +26,11 @@ static void get_neighbor_scores(uint16_t * score_map, uint16_t pos_i,
 
 /* Iterate over scored cells in "score_map" of world.map's geometry. Compare
  * each cell's score against the score of its immediate neighbors in N_DIRS
- * directions. If it's neighbors are low enough that the result would be lower
- * than the current value, re-set it to 1 point higher than its lowest-scored
+ * directions. If any neighbor's score is at least two points lower than the
+ * current cell's score, re-set it to 1 point higher than its lowest-scored
  * neighbor. Repeat this whole process until all cells have settled on their
- * final score. Ignore cells whose position in "score_map" fits cells of
- * unreachable terrain in world.map.cells or whose score is greater than
- * "max_score". Expect "max_score" to be the maximum score for cells, marking
- * them as unreachable.
+ * final score. Ignore cells whose score is greater than "max_score". Expect
+ * "max_score" to be the maximum score for cells, marking them as unreachable.
  */
 static void dijkstra_map(uint16_t * score_map, uint16_t max_score);
 
@@ -42,6 +39,9 @@ static void dijkstra_map(uint16_t * score_map, uint16_t max_score);
  */
 static char get_dir_to_nearest_enemy(struct Thing * thing_origin);
 
+/* Return 1 if any animate thing not "t_origin" is in its field of view. */
+static uint8_t seeing_enemies(struct Thing * t_origin);
+
 
 
 static void get_neighbor_scores(uint16_t * score_map, uint16_t pos_i,
@@ -97,7 +97,7 @@ static void dijkstra_map(uint16_t * score_map, uint16_t max_score)
         scores_still_changing = 0;
         for (pos = 0; pos < map_size; pos++)
         {
-            if ('.' == world.map.cells[pos] && score_map[pos] <= max_score)
+            if (score_map[pos] <= max_score)
             {
                 get_neighbor_scores(score_map, pos, max_score, neighbors);
                 min_neighbor = max_score;
@@ -132,12 +132,17 @@ static char get_dir_to_nearest_enemy(struct Thing * t_origin)
     uint32_t i;
     for (i = 0; i < map_size; i++)
     {
-        score_map[i] = t_origin->fov_map[i] & VISIBLE ? max_score : UINT16_MAX;
+        score_map[i] = UINT16_MAX;
+        if ('.' == t_origin->mem_map[i])
+        {
+            score_map[i] = max_score;
+        }
     }
     struct Thing * t = world.things;
     for (; t != NULL; t = t->next)
     {
-        if (!t->lifepoints || t == t_origin)
+        if (   !t->lifepoints || t == t_origin
+            || 'H' == t_origin->fov_map[t->pos.y * world.map.length + t->pos.x])
         {
             continue;
         }
@@ -171,13 +176,33 @@ static char get_dir_to_nearest_enemy(struct Thing * t_origin)
 
 
 
+static uint8_t seeing_enemies(struct Thing * t_origin)
+{
+    struct Thing * t = world.things;
+    for (; t != NULL; t = t->next)
+    {
+        if (   t->lifepoints
+            && t != t_origin
+            && 'v' == t_origin->fov_map[t->pos.y * world.map.length + t->pos.x])
+        {
+            return 1;
+        }
+    }
+    return 0;
+}
+
+
+
 extern void ai(struct Thing * t)
 {
     t->command = get_thing_action_id_by_name(s[S_CMD_WAIT]);
-    char sel = t->fov_map ? get_dir_to_nearest_enemy(t) : 0;/* t->fov_map may */
-    if (0 != sel)                                           /* be absent due  */
-    {                                                       /* to god command.*/
-        t->command = get_thing_action_id_by_name(s[S_CMD_MOVE]);
-        t->arg = sel;
+    if (seeing_enemies(t))
+    {
+        char sel = t->fov_map ? get_dir_to_nearest_enemy(t) : 0;
+        if (0 != sel)
+        {
+            t->command = get_thing_action_id_by_name(s[S_CMD_MOVE]);
+            t->arg = sel;
+        }
     }
 }