From 94852d2bbff18a192d198a4bc40bfe2ec83a19c6 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 3 Sep 2023 13:54:21 +0300 Subject: [PATCH 4/4] Rename aitech.[ch] as daitech.[ch] See osdn #48576 Signed-off-by: Marko Lindqvist --- ai/default/Makefile.am | 4 ++-- ai/default/aihand.c | 6 +++--- ai/default/daidomestic.c | 4 ++-- ai/default/daimilitary.c | 2 +- ai/default/{aitech.c => daitech.c} | 2 +- ai/default/{aitech.h => daitech.h} | 12 +++++++----- ai/default/daitools.c | 2 +- meson.build | 2 +- 8 files changed, 18 insertions(+), 16 deletions(-) rename ai/default/{aitech.c => daitech.c} (99%) rename ai/default/{aitech.h => daitech.h} (83%) diff --git a/ai/default/Makefile.am b/ai/default/Makefile.am index 15f094cc08..dc4f713d6c 100644 --- a/ai/default/Makefile.am +++ b/ai/default/Makefile.am @@ -26,8 +26,6 @@ libdefaultai_la_SOURCES = \ aihand.h \ aiparatrooper.c \ aiparatrooper.h \ - aitech.c \ - aitech.h \ daiactions.c \ daiactions.h \ daicity.c \ @@ -50,6 +48,8 @@ libdefaultai_la_SOURCES = \ daiplayer.h \ daisettler.c \ daisettler.h \ + daitech.c \ + daitech.h \ daitools.c \ daitools.h \ daiunit.c \ diff --git a/ai/default/aihand.c b/ai/default/aihand.c index f7003a8f8b..c2c49d34a9 100644 --- a/ai/default/aihand.c +++ b/ai/default/aihand.c @@ -54,13 +54,13 @@ #include "handicaps.h" /* ai/default */ -#include "aitech.h" #include "daicity.h" #include "daidata.h" #include "daidiplomacy.h" #include "dailog.h" #include "daimilitary.h" #include "daiplayer.h" +#include "daitech.h" #include "daitools.h" #include "aihand.h" @@ -68,9 +68,9 @@ /***************************************************************************** A man builds a city With banks and cathedrals - A man melts the sand so he can + A man melts the sand so he can See the world outside - A man makes a car + A man makes a car And builds a road to run them on A man dreams of leaving but he always stays behind diff --git a/ai/default/daidomestic.c b/ai/default/daidomestic.c index 35d35e54d8..364a503302 100644 --- a/ai/default/daidomestic.c +++ b/ai/default/daidomestic.c @@ -52,11 +52,11 @@ #include "handicaps.h" /* ai/default */ -#include "aitech.h" #include "daicity.h" #include "daidata.h" #include "daimilitary.h" #include "daiplayer.h" +#include "daitech.h" #include "daitools.h" #include "daidomestic.h" @@ -65,7 +65,7 @@ /***********************************************************************//** Evaluate the need for units (like caravans) that aid wonder construction. If another city is building wonder and needs help but pplayer is not - advanced enough to build caravans, the corresponding tech will be + advanced enough to build caravans, the corresponding tech will be stimulated. ****************************************************************************/ static void dai_choose_help_wonder(struct ai_type *ait, diff --git a/ai/default/daimilitary.c b/ai/default/daimilitary.c index 6fb41c0241..cea18e4356 100644 --- a/ai/default/daimilitary.c +++ b/ai/default/daimilitary.c @@ -58,13 +58,13 @@ #include "aiferry.h" #include "aihand.h" #include "aiparatrooper.h" -#include "aitech.h" #include "daicity.h" #include "daidata.h" #include "daieffects.h" #include "daihunter.h" #include "dailog.h" #include "daiplayer.h" +#include "daitech.h" #include "daitools.h" #include "daimilitary.h" diff --git a/ai/default/aitech.c b/ai/default/daitech.c similarity index 99% rename from ai/default/aitech.c rename to ai/default/daitech.c index 7a82960c78..8dc986a362 100644 --- a/ai/default/aitech.c +++ b/ai/default/daitech.c @@ -43,7 +43,7 @@ #include "daiplayer.h" #include "daiunit.h" -#include "aitech.h" +#include "daitech.h" struct ai_tech_choice { Tech_type_id choice; /* The id of the most needed tech */ diff --git a/ai/default/aitech.h b/ai/default/daitech.h similarity index 83% rename from ai/default/aitech.h rename to ai/default/daitech.h index a46f9310df..897f9805f4 100644 --- a/ai/default/aitech.h +++ b/ai/default/daitech.h @@ -10,8 +10,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ***********************************************************************/ -#ifndef FC__AITECH_H -#define FC__AITECH_H +#ifndef FC__DAITECH_H +#define FC__DAITECH_H /* common */ #include "fc_types.h" @@ -20,11 +20,13 @@ void dai_manage_tech(struct ai_type *ait, struct player *pplayer); void dai_clear_tech_wants(struct ai_type *ait, struct player *pplayer); void dai_next_tech_goal(struct player *pplayer); -struct unit_type *dai_wants_role_unit(struct ai_type *ait, struct player *pplayer, +struct unit_type *dai_wants_role_unit(struct ai_type *ait, + struct player *pplayer, struct city *pcity, int role, int want); struct unit_type *dai_wants_defender_against(struct ai_type *ait, struct player *pplayer, struct city *pcity, - const struct unit_type *att, int want); + const struct unit_type *att, + int want); -#endif /* FC__AITECH_H */ +#endif /* FC__DAITECH_H */ diff --git a/ai/default/daitools.c b/ai/default/daitools.c index 868ce93811..94f861be89 100644 --- a/ai/default/daitools.c +++ b/ai/default/daitools.c @@ -61,11 +61,11 @@ /* ai/default */ #include "aiferry.h" #include "aiguard.h" -#include "aitech.h" #include "daidata.h" #include "dailog.h" #include "daimilitary.h" #include "daiplayer.h" +#include "daitech.h" #include "daitools.h" diff --git a/meson.build b/meson.build index b0210a2e25..dc24ffe7e1 100644 --- a/meson.build +++ b/meson.build @@ -1243,7 +1243,6 @@ ais = static_library('fc_ai', 'ai/default/aiguard.c', 'ai/default/aihand.c', 'ai/default/aiparatrooper.c', - 'ai/default/aitech.c', 'ai/default/daiactions.c', 'ai/default/daicity.c', 'ai/default/daidata.c', @@ -1255,6 +1254,7 @@ ais = static_library('fc_ai', 'ai/default/daimilitary.c', 'ai/default/daiplayer.c', 'ai/default/daisettler.c', + 'ai/default/daitech.c', 'ai/default/daitools.c', 'ai/default/daiunit.c', sources: [verhdr], -- 2.40.1