From 740184f76db452d910816381efd6f619b0607b48 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 24 Nov 2022 02:50:24 +0200 Subject: [PATCH 27/27] Correct name of daicity.c in comments Several comments referred to it as 'aicity.c' See osdn #46105 Signed-off-by: Marko Lindqvist --- ai/default/aitech.c | 2 +- ai/default/daicity.h | 6 +++--- ai/default/daidomestic.c | 7 ++++--- ai/default/daidomestic.h | 5 +++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ai/default/aitech.c b/ai/default/aitech.c index 4f1119ea6e..8d548286b1 100644 --- a/ai/default/aitech.c +++ b/ai/default/aitech.c @@ -248,7 +248,7 @@ static adv_want dai_tech_base_want(struct ai_type *ait, struct player *pplayer, **************************************************************************/ static void dai_tech_effect_values(struct ai_type *ait, struct player *pplayer) { - /* TODO: Currently this duplicates code from aicity.c improvement effect + /* TODO: Currently this duplicates code from daicity.c improvement effect * evaluating almost verbose - refactor so that they can share code. */ struct adv_data *adv = adv_data_get(pplayer, NULL); struct ai_plr *aip = def_ai_player_data(pplayer, ait); diff --git a/ai/default/daicity.h b/ai/default/daicity.h index 57ea1df7a8..2a1633a32d 100644 --- a/ai/default/daicity.h +++ b/ai/default/daicity.h @@ -14,7 +14,7 @@ #define FC__DAICITY_H /* common */ -#include "effects.h" /* enum effect_type */ +#include "effects.h" /* enum effect_type */ #include "fc_types.h" /* server/advisors */ @@ -23,7 +23,7 @@ struct adv_data; struct tech_vector; -struct ai_activity_cache; /* defined and only used within aicity.c */ +struct ai_activity_cache; /* Defined and only used within daicity.c */ /* Who's coming to kill us, for attack co-ordination */ struct ai_invasion { @@ -113,4 +113,4 @@ Impr_type_id dai_find_source_building(struct city *pcity, adv_want dai_city_want(struct player *pplayer, struct city *acity, struct adv_data *adv, struct impr_type *pimprove); -#endif /* FC__DAICITY_H */ +#endif /* FC__DAICITY_H */ diff --git a/ai/default/daidomestic.c b/ai/default/daidomestic.c index aba81c72e1..8cb528225a 100644 --- a/ai/default/daidomestic.c +++ b/ai/default/daidomestic.c @@ -487,7 +487,8 @@ static void dai_choose_trade_route(struct ai_type *ait, struct city *pcity, If want is 0, this advisor doesn't want anything. ***************************************************************************/ -struct adv_choice *domestic_advisor_choose_build(struct ai_type *ait, struct player *pplayer, +struct adv_choice *domestic_advisor_choose_build(struct ai_type *ait, + struct player *pplayer, struct city *pcity) { struct adv_data *adv = adv_data_get(pplayer, NULL); @@ -501,8 +502,8 @@ struct adv_choice *domestic_advisor_choose_build(struct ai_type *ait, struct pla /* Find out desire for workers (terrain improvers) */ worker_type = city_data->worker_type; - /* The worker want is calculated in aicity.c called from - * dai_manage_cities. The expand value is the % that the AI should + /* The worker want is calculated in daicity.c called from + * dai_manage_cities(). The expand value is the % that the AI should * value expansion (basically to handicap easier difficulty levels) * and is set when the difficulty level is changed (difficulty.c). */ worker_want = city_data->worker_want * pplayer->ai_common.expand / 100; diff --git a/ai/default/daidomestic.h b/ai/default/daidomestic.h index c43237711c..f5ed4abf5e 100644 --- a/ai/default/daidomestic.h +++ b/ai/default/daidomestic.h @@ -16,10 +16,11 @@ /* common */ #include "fc_types.h" -struct adv_choice *domestic_advisor_choose_build(struct ai_type *ait, struct player *pplayer, +struct adv_choice *domestic_advisor_choose_build(struct ai_type *ait, + struct player *pplayer, struct city *pcity); void dai_wonder_city_distance(struct ai_type *ait, struct player *pplayer, struct adv_data *adv); -#endif /* FC__DAIDOMESTIC_H */ +#endif /* FC__DAIDOMESTIC_H */ -- 2.35.1