X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fai.c;h=497d35d4e633ca50a2cc9f9e81dc235755d7f603;hb=aaa8274f5566c6f1a16bb3c8971f422ff06d0e37;hp=54db84babcf99dc2cebf60f8dd66c0ff152c877d;hpb=d92f16d5959fc846d3eaf669517eecb3969cda08;p=plomrogue diff --git a/src/server/ai.c b/src/server/ai.c index 54db84b..497d35d 100644 --- a/src/server/ai.c +++ b/src/server/ai.c @@ -6,6 +6,7 @@ #include /* 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 */ #include "world.h" /* global world */ @@ -87,7 +88,8 @@ static void get_neighbor_scores(uint16_t * score_map, uint16_t pos_i, static void dijkstra_map(uint16_t * score_map, uint16_t max_score) { uint32_t map_size = world.map.length * world.map.length; - uint16_t pos, i_scans, neighbors[N_DIRS], min_neighbor; + uint32_t pos; + uint16_t i_scans, neighbors[N_DIRS], min_neighbor; uint8_t scores_still_changing = 1; uint8_t i_dirs; for (i_scans = 0; scores_still_changing; i_scans++) @@ -168,11 +170,11 @@ static char get_dir_to_nearest_enemy(struct Thing * t_origin) extern void ai(struct Thing * t) { - t->command = get_thing_action_id_by_name("wait"); - char sel = get_dir_to_nearest_enemy(t); - if (0 != sel) - { - t->command = get_thing_action_id_by_name("move"); + 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; } }