Server/C: Fix bug of ignoring wait set by get_dir_from_neighbors().

[plomrogue] / src / server / ai.c

diff --git a/src/server/ai.c b/src/server/ai.c
index ba1db3842a1f2021b73088a7b5fbbea3be53ab25..749a3858afaa4078e9fa0357e9f4cbfde9f1958c 100644 (file)
--- a/src/server/ai.c
+++ b/src/server/ai.c
@@ -67,9 +67,9 @@ static char get_dir_from_neighbors(char filter, struct Thing * t_eye,
 /* Set (if possible) as "t_eye"'s command a move to the path to the path-wise
  * nearest target that is not "t_eye" and fits criteria set by "filter". On
  * success, return !0, else 0. Values for "filter":
- * "a": thing in FOV is animate, but of a type that is not "t_eye"'s, and
- *      starts out weaker than it is; build path as avoiding things of "t_eye"'s
- *      type
+ * "a": thing in FOV is below a certain distance, animate, but of a type that is
+ *      not "t_eye"'s, and starts out weaker than it is; build path as avoiding
+ *      things of "t_eye"'s type
  * "f": neighbor cell (not inhabited by any animate thing) further away from
  *      animate thing not further than x steps away and in FOV and of a type
  *      that is not "t_eye"'s, and starts out stronger or as strong as "t_eye"
@@ -352,6 +352,10 @@ static char get_dir_from_neighbors(char filter, struct Thing * t_eye,
             dir_to_nearest_target = 0;                          /* a certain  */
         }                                                       /* distance.  */
     }
+    else if ('a' == filter && 10 <= score_map[pos_i])
+    {
+        dir_to_nearest_target = 0;
+    }
     return dir_to_nearest_target;
 }
 
@@ -374,7 +378,7 @@ static uint8_t get_dir_to_nearest_target(struct Thing * t_eye, char filter)
         dijkstra_map(score_map, UINT16_MAX-1);
         dir_to_nearest_target = get_dir_from_neighbors(filter,t_eye,score_map);
         free(score_map);
-        if (dir_to_nearest_target)
+        if (dir_to_nearest_target && 1 != dir_to_nearest_target)
         {
             t_eye->command = get_thing_action_id_by_name(s[S_CMD_MOVE]);
             t_eye->arg = dir_to_nearest_target;