From 8d99c396ca4dc7936b7978b09683562969da250f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 30 May 2021 05:49:20 +0300 Subject: [PATCH 57/57] AI: Rename aiplayer.[ch] as daiplayer.[ch] See osdn #42205 Signed-off-by: Marko Lindqvist --- ai/classic/classicai.c | 2 +- ai/default/Makefile.am | 4 ++-- ai/default/aiair.c | 2 +- ai/default/aidata.c | 2 +- ai/default/aidiplomat.c | 2 +- ai/default/aiferry.c | 2 +- ai/default/aiguard.c | 2 +- ai/default/aihand.c | 2 +- ai/default/aihunt.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/daidiplomacy.c | 2 +- ai/default/daidomestic.c | 2 +- ai/default/daimilitary.c | 2 +- ai/default/{aiplayer.c => daiplayer.c} | 2 +- ai/default/{aiplayer.h => daiplayer.h} | 6 +++--- ai/default/daisettler.c | 2 +- ai/tex/texai.c | 2 +- ai/tex/texaiplayer.c | 2 +- ai/threaded/taiplayer.c | 2 +- ai/threaded/threadedai.c | 2 +- meson.build | 2 +- 26 files changed, 29 insertions(+), 29 deletions(-) rename ai/default/{aiplayer.c => daiplayer.c} (99%) rename ai/default/{aiplayer.h => daiplayer.h} (97%) diff --git a/ai/classic/classicai.c b/ai/classic/classicai.c index ce945227b0..5ba8bdcbd1 100644 --- a/ai/classic/classicai.c +++ b/ai/classic/classicai.c @@ -28,13 +28,13 @@ #include "aiferry.h" #include "aihand.h" #include "ailog.h" -#include "aiplayer.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" #include "daidiplomacy.h" #include "daidomestic.h" #include "daimilitary.h" +#include "daiplayer.h" #include "daisettler.h" #include "classicai.h" diff --git a/ai/default/Makefile.am b/ai/default/Makefile.am index 4da3b8dd8c..e32724a6bd 100644 --- a/ai/default/Makefile.am +++ b/ai/default/Makefile.am @@ -30,8 +30,6 @@ libdefaultai_la_SOURCES = \ ailog.h \ aiparatrooper.c \ aiparatrooper.h \ - aiplayer.c \ - aiplayer.h \ aitech.c \ aitech.h \ aitools.c \ @@ -52,6 +50,8 @@ libdefaultai_la_SOURCES = \ daieffects.h \ daimilitary.c \ daimilitary.h \ + daiplayer.c \ + daiplayer.h \ daisettler.c \ daisettler.h diff --git a/ai/default/aiair.c b/ai/default/aiair.c index 8c925f457d..ca9bdec145 100644 --- a/ai/default/aiair.c +++ b/ai/default/aiair.c @@ -42,11 +42,11 @@ #include "handicaps.h" /* ai/default */ -#include "aiplayer.h" #include "ailog.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" +#include "daiplayer.h" #include "aiair.h" diff --git a/ai/default/aidata.c b/ai/default/aidata.c index 2dd2335bd1..6eaeed1892 100644 --- a/ai/default/aidata.c +++ b/ai/default/aidata.c @@ -34,11 +34,11 @@ /* ai/default */ #include "aiferry.h" -#include "aiplayer.h" #include "aiunit.h" #include "daicity.h" #include "daidiplomacy.h" #include "daieffects.h" +#include "daiplayer.h" #include "daisettler.h" #include "aidata.h" diff --git a/ai/default/aidiplomat.c b/ai/default/aidiplomat.c index 5d73754088..250936aea5 100644 --- a/ai/default/aidiplomat.c +++ b/ai/default/aidiplomat.c @@ -64,12 +64,12 @@ #include "aiguard.h" #include "aihand.h" #include "ailog.h" -#include "aiplayer.h" #include "aitools.h" #include "aiunit.h" #include "daiactions.h" #include "daicity.h" #include "daimilitary.h" +#include "daiplayer.h" #include "aidiplomat.h" diff --git a/ai/default/aiferry.c b/ai/default/aiferry.c index eb38824cc0..9391c8701e 100644 --- a/ai/default/aiferry.c +++ b/ai/default/aiferry.c @@ -49,9 +49,9 @@ #include "aidata.h" #include "aiguard.h" #include "ailog.h" -#include "aiplayer.h" #include "aitools.h" #include "aiunit.h" +#include "daiplayer.h" #include "aiferry.h" diff --git a/ai/default/aiguard.c b/ai/default/aiguard.c index c3db875ca2..21d74432d3 100644 --- a/ai/default/aiguard.c +++ b/ai/default/aiguard.c @@ -27,9 +27,9 @@ /* ai */ #include "ailog.h" -#include "aiplayer.h" #include "aitools.h" #include "aiunit.h" +#include "daiplayer.h" #include "aiguard.h" diff --git a/ai/default/aihand.c b/ai/default/aihand.c index 456fca49db..2a244bde6b 100644 --- a/ai/default/aihand.c +++ b/ai/default/aihand.c @@ -56,13 +56,13 @@ /* ai/default */ #include "aidata.h" #include "ailog.h" -#include "aiplayer.h" #include "aitech.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" #include "daidiplomacy.h" #include "daimilitary.h" +#include "daiplayer.h" #include "aihand.h" diff --git a/ai/default/aihunt.c b/ai/default/aihunt.c index ccd598796c..16402b7bd5 100644 --- a/ai/default/aihunt.c +++ b/ai/default/aihunt.c @@ -49,10 +49,10 @@ /* ai/default */ #include "ailog.h" -#include "aiplayer.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" +#include "daiplayer.h" #include "aihunt.h" diff --git a/ai/default/ailog.c b/ai/default/ailog.c index 4dc0adf991..ecb7482fbc 100644 --- a/ai/default/ailog.c +++ b/ai/default/ailog.c @@ -27,9 +27,9 @@ /* ai/default */ #include "aidata.h" -#include "aiplayer.h" #include "aiunit.h" #include "daicity.h" +#include "daiplayer.h" #include "ailog.h" diff --git a/ai/default/aiparatrooper.c b/ai/default/aiparatrooper.c index cf994ea4fa..82c98b05b1 100644 --- a/ai/default/aiparatrooper.c +++ b/ai/default/aiparatrooper.c @@ -48,10 +48,10 @@ /* ai/default */ #include "aidata.h" #include "ailog.h" -#include "aiplayer.h" #include "aiunit.h" #include "aitools.h" #include "daicity.h" +#include "daiplayer.h" #include "aiparatrooper.h" diff --git a/ai/default/aitech.c b/ai/default/aitech.c index bd8285162a..1853ad5d61 100644 --- a/ai/default/aitech.c +++ b/ai/default/aitech.c @@ -38,9 +38,9 @@ /* ai/default */ #include "aidata.h" #include "ailog.h" -#include "aiplayer.h" #include "aitools.h" #include "daieffects.h" +#include "daiplayer.h" #include "aitech.h" diff --git a/ai/default/aitools.c b/ai/default/aitools.c index cfdd77d7c6..4e3c6b925c 100644 --- a/ai/default/aitools.c +++ b/ai/default/aitools.c @@ -63,10 +63,10 @@ #include "aiferry.h" #include "aiguard.h" #include "ailog.h" -#include "aiplayer.h" #include "aitech.h" #include "aiunit.h" #include "daimilitary.h" +#include "daiplayer.h" #include "aitools.h" diff --git a/ai/default/aiunit.c b/ai/default/aiunit.c index f6a93a45d8..4545843769 100644 --- a/ai/default/aiunit.c +++ b/ai/default/aiunit.c @@ -74,11 +74,11 @@ #include "aihunt.h" #include "ailog.h" #include "aiparatrooper.h" -#include "aiplayer.h" #include "aitools.h" #include "daicity.h" #include "daieffects.h" #include "daimilitary.h" +#include "daiplayer.h" #include "aiunit.h" diff --git a/ai/default/daicity.c b/ai/default/daicity.c index fd957c5278..17b6074a8a 100644 --- a/ai/default/daicity.c +++ b/ai/default/daicity.c @@ -55,13 +55,13 @@ #include "aidata.h" #include "aihand.h" #include "ailog.h" -#include "aiplayer.h" #include "aitools.h" #include "aiunit.h" #include "daidiplomacy.h" #include "daidomestic.h" #include "daimilitary.h" #include "daieffects.h" +#include "daiplayer.h" #include "daisettler.h" #include "daicity.h" diff --git a/ai/default/daidiplomacy.c b/ai/default/daidiplomacy.c index a45e5a44ea..965699fc02 100644 --- a/ai/default/daidiplomacy.c +++ b/ai/default/daidiplomacy.c @@ -58,11 +58,11 @@ /* ai/default */ #include "aidata.h" #include "ailog.h" -#include "aiplayer.h" #include "aiunit.h" #include "aitools.h" #include "daicity.h" #include "daimilitary.h" +#include "daiplayer.h" #include "daidiplomacy.h" diff --git a/ai/default/daidomestic.c b/ai/default/daidomestic.c index ff7ef86041..6cb026c030 100644 --- a/ai/default/daidomestic.c +++ b/ai/default/daidomestic.c @@ -55,12 +55,12 @@ /* ai/default */ #include "aidata.h" #include "ailog.h" -#include "aiplayer.h" #include "aitech.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" #include "daimilitary.h" +#include "daiplayer.h" #include "daidomestic.h" diff --git a/ai/default/daimilitary.c b/ai/default/daimilitary.c index b0f4fd6e9a..d378fbc99d 100644 --- a/ai/default/daimilitary.c +++ b/ai/default/daimilitary.c @@ -61,12 +61,12 @@ #include "aihunt.h" #include "ailog.h" #include "aiparatrooper.h" -#include "aiplayer.h" #include "aitech.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" #include "daieffects.h" +#include "daiplayer.h" #include "daimilitary.h" diff --git a/ai/default/aiplayer.c b/ai/default/daiplayer.c similarity index 99% rename from ai/default/aiplayer.c rename to ai/default/daiplayer.c index 4359df079e..4cf8dfb768 100644 --- a/ai/default/aiplayer.c +++ b/ai/default/daiplayer.c @@ -28,7 +28,7 @@ #include "aidata.h" #include "daimilitary.h" -#include "aiplayer.h" +#include "daiplayer.h" /**********************************************************************//** Initialize player for use with default AI. Note that this is called diff --git a/ai/default/aiplayer.h b/ai/default/daiplayer.h similarity index 97% rename from ai/default/aiplayer.h rename to ai/default/daiplayer.h index 83f90f9421..6fae4006e7 100644 --- a/ai/default/aiplayer.h +++ b/ai/default/daiplayer.h @@ -10,8 +10,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ***********************************************************************/ -#ifndef FC__AIPLAYER_H -#define FC__AIPLAYER_H +#ifndef FC__DAIPLAYER_H +#define FC__DAIPLAYER_H /* common */ #include "city.h" @@ -62,4 +62,4 @@ struct dai_private_data bool contemplace_workers; }; -#endif /* FC__AIPLAYER_H */ +#endif /* FC__DAIPLAYER_H */ diff --git a/ai/default/daisettler.c b/ai/default/daisettler.c index 7dd280ff4c..3cbcc22b62 100644 --- a/ai/default/daisettler.c +++ b/ai/default/daisettler.c @@ -58,10 +58,10 @@ #include "aidata.h" #include "aiferry.h" #include "ailog.h" -#include "aiplayer.h" #include "aitools.h" #include "aiunit.h" #include "daicity.h" +#include "daiplayer.h" #include "daisettler.h" diff --git a/ai/tex/texai.c b/ai/tex/texai.c index 43c0d4a5e6..9a368a5611 100644 --- a/ai/tex/texai.c +++ b/ai/tex/texai.c @@ -23,12 +23,12 @@ #include "aiferry.h" #include "aihand.h" #include "ailog.h" -#include "aiplayer.h" #include "aitools.h" #include "daicity.h" #include "daidiplomacy.h" #include "daidomestic.h" #include "daimilitary.h" +#include "daiplayer.h" #include "daisettler.h" /* tex ai */ diff --git a/ai/tex/texaiplayer.c b/ai/tex/texaiplayer.c index 45cee1cb15..4135756e29 100644 --- a/ai/tex/texaiplayer.c +++ b/ai/tex/texaiplayer.c @@ -30,8 +30,8 @@ #include "infracache.h" /* ai/default */ -#include "aiplayer.h" #include "daimilitary.h" +#include "daiplayer.h" /* ai/tex */ #include "texaicity.h" diff --git a/ai/threaded/taiplayer.c b/ai/threaded/taiplayer.c index 959879ed10..9a650e7dd2 100644 --- a/ai/threaded/taiplayer.c +++ b/ai/threaded/taiplayer.c @@ -28,7 +28,7 @@ #include "infracache.h" /* ai/default */ -#include "aiplayer.h" +#include "daiplayer.h" /* ai/threaded */ #include "taicity.h" diff --git a/ai/threaded/threadedai.c b/ai/threaded/threadedai.c index fc8307a564..2547ba23c8 100644 --- a/ai/threaded/threadedai.c +++ b/ai/threaded/threadedai.c @@ -23,12 +23,12 @@ #include "aiferry.h" #include "aihand.h" #include "ailog.h" -#include "aiplayer.h" #include "aitools.h" #include "daicity.h" #include "daidiplomacy.h" #include "daidomestic.h" #include "daimilitary.h" +#include "daiplayer.h" #include "daisettler.h" /* threaded ai */ diff --git a/meson.build b/meson.build index 069c337818..d02fa768cf 100644 --- a/meson.build +++ b/meson.build @@ -607,7 +607,6 @@ ais = static_library('fc_ai', 'ai/default/aihunt.c', 'ai/default/ailog.c', 'ai/default/aiparatrooper.c', - 'ai/default/aiplayer.c', 'ai/default/aitech.c', 'ai/default/aitools.c', 'ai/default/aiunit.c', @@ -617,6 +616,7 @@ ais = static_library('fc_ai', 'ai/default/daidomestic.c', 'ai/default/daieffects.c', 'ai/default/daimilitary.c', + 'ai/default/daiplayer.c', 'ai/default/daisettler.c', include_directories: [server_inc, include_directories('ai/default')], sources: [verhdr] -- 2.30.2