From bff73ac5630a9df0d7c8d1a73bfa6f7bf027fd54 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 19 Jun 2022 16:12:26 +0300 Subject: [PATCH 41/41] Rename aidata.[ch] as daidata.[ch] See osdn #44869 Signed-off-by: Marko Lindqvist --- ai/classic/classicai.c | 2 +- ai/default/Makefile.am | 4 ++-- ai/default/aidiplomat.c | 2 +- ai/default/aiferry.c | 2 +- ai/default/aihand.c | 2 +- ai/default/ailog.c | 2 +- ai/default/aiparatrooper.c | 2 +- ai/default/aitech.c | 2 +- ai/default/aitools.c | 2 +- ai/default/aiunit.c | 2 +- ai/default/daicity.c | 2 +- ai/default/{aidata.c => daidata.c} | 2 +- ai/default/{aidata.h => daidata.h} | 9 +++++---- ai/default/daidiplomacy.c | 2 +- ai/default/daidomestic.c | 2 +- ai/default/daimilitary.c | 2 +- ai/default/daiplayer.c | 2 +- ai/default/daisettler.c | 2 +- ai/tex/texai.c | 1 - ai/tex/texaicity.c | 2 +- ai/tex/texaiplayer.h | 2 +- ai/threaded/taiplayer.h | 2 +- ai/threaded/threadedai.c | 1 - meson.build | 2 +- 24 files changed, 27 insertions(+), 28 deletions(-) rename ai/default/{aidata.c => daidata.c} (99%) rename ai/default/{aidata.h => daidata.h} (95%) diff --git a/ai/classic/classicai.c b/ai/classic/classicai.c index 5ba8bdcbd1..ea72caa76c 100644 --- a/ai/classic/classicai.c +++ b/ai/classic/classicai.c @@ -24,13 +24,13 @@ #include "autosettlers.h" /* ai/default */ -#include "aidata.h" #include "aiferry.h" #include "aihand.h" #include "ailog.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" +#include "daidata.h" #include "daidiplomacy.h" #include "daidomestic.h" #include "daimilitary.h" diff --git a/ai/default/Makefile.am b/ai/default/Makefile.am index e32724a6bd..fb26920163 100644 --- a/ai/default/Makefile.am +++ b/ai/default/Makefile.am @@ -16,8 +16,6 @@ AM_CPPFLAGS = \ libdefaultai_la_SOURCES = \ aiair.c \ aiair.h \ - aidata.c \ - aidata.h \ aiferry.c \ aiferry.h \ aiguard.c \ @@ -42,6 +40,8 @@ libdefaultai_la_SOURCES = \ daiactions.h \ daicity.c \ daicity.h \ + daidata.c \ + daidata.h \ daidiplomacy.c \ daidiplomacy.h \ daidomestic.c \ diff --git a/ai/default/aidiplomat.c b/ai/default/aidiplomat.c index 250936aea5..f51841df81 100644 --- a/ai/default/aidiplomat.c +++ b/ai/default/aidiplomat.c @@ -60,7 +60,6 @@ #include "handicaps.h" /* ai/default */ -#include "aidata.h" #include "aiguard.h" #include "aihand.h" #include "ailog.h" @@ -68,6 +67,7 @@ #include "aiunit.h" #include "daiactions.h" #include "daicity.h" +#include "daidata.h" #include "daimilitary.h" #include "daiplayer.h" diff --git a/ai/default/aiferry.c b/ai/default/aiferry.c index c0cb070dfb..645182a7f0 100644 --- a/ai/default/aiferry.c +++ b/ai/default/aiferry.c @@ -46,11 +46,11 @@ #include "handicaps.h" /* ai/default */ -#include "aidata.h" #include "aiguard.h" #include "ailog.h" #include "aitools.h" #include "aiunit.h" +#include "daidata.h" #include "daiplayer.h" #include "aiferry.h" diff --git a/ai/default/aihand.c b/ai/default/aihand.c index e4401afae2..da09d4c15e 100644 --- a/ai/default/aihand.c +++ b/ai/default/aihand.c @@ -54,12 +54,12 @@ #include "handicaps.h" /* ai/default */ -#include "aidata.h" #include "ailog.h" #include "aitech.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" +#include "daidata.h" #include "daidiplomacy.h" #include "daimilitary.h" #include "daiplayer.h" diff --git a/ai/default/ailog.c b/ai/default/ailog.c index ecb7482fbc..60170addd4 100644 --- a/ai/default/ailog.c +++ b/ai/default/ailog.c @@ -26,9 +26,9 @@ #include "notify.h" /* ai/default */ -#include "aidata.h" #include "aiunit.h" #include "daicity.h" +#include "daidata.h" #include "daiplayer.h" #include "ailog.h" diff --git a/ai/default/aiparatrooper.c b/ai/default/aiparatrooper.c index 88a327065b..eb8260ee8f 100644 --- a/ai/default/aiparatrooper.c +++ b/ai/default/aiparatrooper.c @@ -46,11 +46,11 @@ #include "handicaps.h" /* ai/default */ -#include "aidata.h" #include "ailog.h" #include "aiunit.h" #include "aitools.h" #include "daicity.h" +#include "daidata.h" #include "daiplayer.h" #include "aiparatrooper.h" diff --git a/ai/default/aitech.c b/ai/default/aitech.c index d9a1db342f..21540d0c4c 100644 --- a/ai/default/aitech.c +++ b/ai/default/aitech.c @@ -36,9 +36,9 @@ #include "advdata.h" /* ai/default */ -#include "aidata.h" #include "ailog.h" #include "aitools.h" +#include "daidata.h" #include "daieffects.h" #include "daiplayer.h" diff --git a/ai/default/aitools.c b/ai/default/aitools.c index 67e2f78446..ff98edf2e2 100644 --- a/ai/default/aitools.c +++ b/ai/default/aitools.c @@ -59,12 +59,12 @@ #include "handicaps.h" /* ai/default */ -#include "aidata.h" #include "aiferry.h" #include "aiguard.h" #include "ailog.h" #include "aitech.h" #include "aiunit.h" +#include "daidata.h" #include "daimilitary.h" #include "daiplayer.h" diff --git a/ai/default/aiunit.c b/ai/default/aiunit.c index de3b7886b1..c53d31a06c 100644 --- a/ai/default/aiunit.c +++ b/ai/default/aiunit.c @@ -66,7 +66,6 @@ /* ai/default */ #include "aiair.h" -#include "aidata.h" #include "aidiplomat.h" #include "aiferry.h" #include "aiguard.h" @@ -76,6 +75,7 @@ #include "aiparatrooper.h" #include "aitools.h" #include "daicity.h" +#include "daidata.h" #include "daieffects.h" #include "daimilitary.h" #include "daiplayer.h" diff --git a/ai/default/daicity.c b/ai/default/daicity.c index 38c76e2931..e2322ee763 100644 --- a/ai/default/daicity.c +++ b/ai/default/daicity.c @@ -52,11 +52,11 @@ #include "handicaps.h" /* ai/default */ -#include "aidata.h" #include "aihand.h" #include "ailog.h" #include "aitools.h" #include "aiunit.h" +#include "daidata.h" #include "daidiplomacy.h" #include "daidomestic.h" #include "daimilitary.h" diff --git a/ai/default/aidata.c b/ai/default/daidata.c similarity index 99% rename from ai/default/aidata.c rename to ai/default/daidata.c index 36953f0840..e2063fb9bd 100644 --- a/ai/default/aidata.c +++ b/ai/default/daidata.c @@ -41,7 +41,7 @@ #include "daiplayer.h" #include "daisettler.h" -#include "aidata.h" +#include "daidata.h" static void dai_diplomacy_new(struct ai_type *ait, const struct player *plr1, diff --git a/ai/default/aidata.h b/ai/default/daidata.h similarity index 95% rename from ai/default/aidata.h rename to ai/default/daidata.h index bdcb659115..7b65b45206 100644 --- a/ai/default/aidata.h +++ b/ai/default/daidata.h @@ -10,8 +10,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ***********************************************************************/ -#ifndef FC__AIDATA_H -#define FC__AIDATA_H +#ifndef FC__DAIDATA_H +#define FC__DAIDATA_H /* utility */ #include "support.h" @@ -120,9 +120,10 @@ struct ai_dip_intel *dai_diplomacy_get(struct ai_type *ait, const struct player *plr1, const struct player *plr2); -void dai_gov_value(struct ai_type *ait, struct player *pplayer, struct government *gov, +void dai_gov_value(struct ai_type *ait, struct player *pplayer, + struct government *gov, adv_want *val, bool *override); void dai_adjust_policies(struct ai_type *ait, struct player *pplayer); -#endif /* FC__AIDATA_H */ +#endif /* FC__DAIDATA_H */ diff --git a/ai/default/daidiplomacy.c b/ai/default/daidiplomacy.c index ba78b012c6..6b593b2d09 100644 --- a/ai/default/daidiplomacy.c +++ b/ai/default/daidiplomacy.c @@ -56,11 +56,11 @@ #include "handicaps.h" /* ai/default */ -#include "aidata.h" #include "ailog.h" #include "aiunit.h" #include "aitools.h" #include "daicity.h" +#include "daidata.h" #include "daimilitary.h" #include "daiplayer.h" diff --git a/ai/default/daidomestic.c b/ai/default/daidomestic.c index 14c2ed9014..22e576541a 100644 --- a/ai/default/daidomestic.c +++ b/ai/default/daidomestic.c @@ -53,12 +53,12 @@ #include "handicaps.h" /* ai/default */ -#include "aidata.h" #include "ailog.h" #include "aitech.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" +#include "daidata.h" #include "daimilitary.h" #include "daiplayer.h" diff --git a/ai/default/daimilitary.c b/ai/default/daimilitary.c index 3ea7be5286..36bc3adc1c 100644 --- a/ai/default/daimilitary.c +++ b/ai/default/daimilitary.c @@ -54,7 +54,6 @@ /* ai/default */ #include "aiair.h" -#include "aidata.h" #include "aidiplomat.h" #include "aiferry.h" #include "aihand.h" @@ -65,6 +64,7 @@ #include "aitools.h" #include "aiunit.h" #include "daicity.h" +#include "daidata.h" #include "daieffects.h" #include "daiplayer.h" diff --git a/ai/default/daiplayer.c b/ai/default/daiplayer.c index 4cf8dfb768..7387088ffc 100644 --- a/ai/default/daiplayer.c +++ b/ai/default/daiplayer.c @@ -25,7 +25,7 @@ #include "citytools.h" /* ai/default */ -#include "aidata.h" +#include "daidata.h" #include "daimilitary.h" #include "daiplayer.h" diff --git a/ai/default/daisettler.c b/ai/default/daisettler.c index 722c7b93fc..2ae4c9e20a 100644 --- a/ai/default/daisettler.c +++ b/ai/default/daisettler.c @@ -55,12 +55,12 @@ #include "handicaps.h" /* ai/default */ -#include "aidata.h" #include "aiferry.h" #include "ailog.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" +#include "daidata.h" #include "daiplayer.h" #include "daisettler.h" diff --git a/ai/tex/texai.c b/ai/tex/texai.c index 9a368a5611..a91c959883 100644 --- a/ai/tex/texai.c +++ b/ai/tex/texai.c @@ -19,7 +19,6 @@ #include "ai.h" /* ai/default */ -#include "aidata.h" #include "aiferry.h" #include "aihand.h" #include "ailog.h" diff --git a/ai/tex/texaicity.c b/ai/tex/texaicity.c index df0388b511..48371a872c 100644 --- a/ai/tex/texaicity.c +++ b/ai/tex/texaicity.c @@ -37,7 +37,7 @@ #include "infracache.h" /* ai/default */ -#include "aidata.h" +#include "daidata.h" /* ai/tex */ #include "texaimsg.h" diff --git a/ai/tex/texaiplayer.h b/ai/tex/texaiplayer.h index 6fe4b6820f..c2c6030ce8 100644 --- a/ai/tex/texaiplayer.h +++ b/ai/tex/texaiplayer.h @@ -20,7 +20,7 @@ #include "player.h" /* ai/default */ -#include "aidata.h" +#include "daidata.h" /* ai/tex */ #include "texaimsg.h" diff --git a/ai/threaded/taiplayer.h b/ai/threaded/taiplayer.h index 04638acb9a..cf77bf6455 100644 --- a/ai/threaded/taiplayer.h +++ b/ai/threaded/taiplayer.h @@ -20,7 +20,7 @@ #include "player.h" /* ai/default */ -#include "aidata.h" +#include "daidata.h" /* ai/threaded */ #include "taimsg.h" diff --git a/ai/threaded/threadedai.c b/ai/threaded/threadedai.c index 2547ba23c8..42397acf9b 100644 --- a/ai/threaded/threadedai.c +++ b/ai/threaded/threadedai.c @@ -19,7 +19,6 @@ #include "ai.h" /* ai/default */ -#include "aidata.h" #include "aiferry.h" #include "aihand.h" #include "ailog.h" diff --git a/meson.build b/meson.build index 90519e4229..686c4162c2 100644 --- a/meson.build +++ b/meson.build @@ -800,7 +800,6 @@ ais = static_library('fc_ai', 'ai/tex/texaiplayer.c', 'ai/tex/texaiworld.c', 'ai/default/aiair.c', - 'ai/default/aidata.c', 'ai/default/aidiplomat.c', 'ai/default/aiferry.c', 'ai/default/aiguard.c', @@ -813,6 +812,7 @@ ais = static_library('fc_ai', 'ai/default/aiunit.c', 'ai/default/daiactions.c', 'ai/default/daicity.c', + 'ai/default/daidata.c', 'ai/default/daidiplomacy.c', 'ai/default/daidomestic.c', 'ai/default/daieffects.c', -- 2.35.1