X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fai.c;h=4789c41cf1d797cbc360761469c41cb2da7a1a30;hb=cb4bbc0c2d65535d1d47822d86ad88194243a31a;hp=497d35d4e633ca50a2cc9f9e81dc235755d7f603;hpb=150b9f88a4c73caad8fcf0b850db8e52e4f4c6ae;p=plomrogue
diff --git a/src/server/ai.c b/src/server/ai.c
index 497d35d..4789c41 100644
--- a/src/server/ai.c
+++ b/src/server/ai.c
@@ -122,19 +122,18 @@ static void dijkstra_map(uint16_t * score_map, uint16_t max_score)
static char get_dir_to_nearest_enemy(struct Thing * t_origin)
{
- char * f_name = "get_dir_to_nearest_enemy()";
-
- /* Calculate for each cell the distance to the visibly nearest map actor not
- * "t_origin", with movement only possible in the directions of "dir".
- * (Actors' own cells start with a distance of 0 towards themselves.)
+ /* Calculate for each cell distance to visibly nearest enemy, with movement
+ * possible in the directions or "dir". (Actor's own cells start with 0
+ * distance towards themselves. Cells of actors of own type are invisible.)
*/
uint32_t map_size = world.map.length * world.map.length;
uint16_t max_score = UINT16_MAX - 1;
- uint16_t * score_map = try_malloc(map_size * sizeof(uint16_t), f_name);
+ uint16_t * score_map = try_malloc(map_size * sizeof(uint16_t), __func__);
uint32_t i;
for (i = 0; i < map_size; i++)
{
score_map[i] = t_origin->fov_map[i] & VISIBLE ? max_score : UINT16_MAX;
+
}
struct Thing * t = world.things;
for (; t != NULL; t = t->next)
@@ -143,7 +142,12 @@ static char get_dir_to_nearest_enemy(struct Thing * t_origin)
{
continue;
}
- score_map[(t->pos.y * world.map.length) + t->pos.x] = 0;
+ if (t->lifepoints && t->type == t_origin->type)
+ {
+ score_map[t->pos.y * world.map.length + t->pos.x] = UINT16_MAX;
+ continue;
+ }
+ score_map[t->pos.y * world.map.length + t->pos.x] = 0;
}
dijkstra_map(score_map, max_score);