From fe78b0a606aba13af63e4fbf96a7b90d00fe8ddd Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 16 May 2020 10:42:48 +0900 Subject: [PATCH] [Refactor] #38862 Moved selfinfo.c/h to player/ --- Hengband/Hengband/Hengband.vcxproj | 6 +++--- Hengband/Hengband/Hengband.vcxproj.filters | 14 +++++++------- src/Makefile.am | 16 ++++++++++------ src/cmd/cmd-item.c | 2 +- src/cmd/cmd-quaff.c | 2 +- src/cmd/cmd-spell.c | 2 +- src/mutation/mutation.c | 2 +- src/{ => player}/selfinfo.c | 1 + src/{ => player}/selfinfo.h | 0 src/realm/realm-craft.c | 2 +- src/realm/realm-sorcery.c | 2 +- src/wizard/wizard-special-process.c | 2 +- 12 files changed, 28 insertions(+), 23 deletions(-) rename src/{ => player}/selfinfo.c (99%) rename src/{ => player}/selfinfo.h (100%) diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index a296c0c69..01ad8111e 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -277,7 +277,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -703,7 +703,7 @@ - + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index bd0ba0da8..d5869933f 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -11,9 +11,6 @@ market - - player - core @@ -830,7 +827,10 @@ mind - + + player + + birth @@ -844,9 +844,6 @@ market - - player - core @@ -1711,6 +1708,9 @@ birth + + player + diff --git a/src/Makefile.am b/src/Makefile.am index d1e6d0db7..8bc4221da 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -169,11 +169,15 @@ hengband_SOURCES = \ patron.h patron.c \ \ creature.h creature.c \ - player/player-move.c player/player-move.h player/player-damage.c player/player-damage.h \ - player/player-status.c player/player-status.h player/player-effects.c player/player-effects.h \ - player/player-skill.c player/player-skill.h player/player-class.c player/player-class.h \ - player/player-race.c player/player-race.h player/player-personality.c player/player-personality.h \ - player/player-sex.c player/player-sex.h \ + player/player-move.c player/player-move.h \ + player/player-damage.c player/player-damage.h \ + player/player-status.c player/player-status.h \ + player/player-effects.c player/player-effects.h \ + player/player-skill.c player/player-skill.h \ + player/player-class.c player/player-class.h \ + player/player-race.c player/player-race.h \ + player/player-personality.c player/player-personality.h \ + player/player-sex.c player/player-sex.h player/selfinfo.c player/selfinfo.h \ \ quest.h quest.c\ \ @@ -201,7 +205,7 @@ hengband_SOURCES = \ room/rooms-pit-nest.c room/rooms-pit-nest.h \ room/pit-nest-kinds-table.c room/pit-nest-kinds-table.h \ \ - save.c save.h scores.c scores.h selfinfo.c selfinfo.h \ + save.c save.h scores.c scores.h \ snipe.c snipe.h \ \ effect/effect-feature.c effect/effect-feature.h \ diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c index 81746d2f5..5e72fc389 100644 --- a/src/cmd/cmd-item.c +++ b/src/cmd/cmd-item.c @@ -16,7 +16,7 @@ #include "main/sound-definitions-table.h" #include "term/gameterm.h" -#include "selfinfo.h" +#include "player/selfinfo.h" #include "cmd-activate.h" #include "cmd-eat.h" #include "cmd-quaff.h" diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c index 6724212d1..7b1875c91 100644 --- a/src/cmd/cmd-quaff.c +++ b/src/cmd/cmd-quaff.c @@ -11,7 +11,7 @@ #include "main/sound-definitions-table.h" #include "birth/birth.h" -#include "selfinfo.h" +#include "player/selfinfo.h" #include "object/object-hook.h" #include "mutation/mutation.h" #include "player/avatar.h" diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c index 19bfff021..aebcb9cb8 100644 --- a/src/cmd/cmd-spell.c +++ b/src/cmd/cmd-spell.c @@ -14,7 +14,7 @@ #include "io/write-diary.h" #include "cmd/cmd-dump.h" -#include "selfinfo.h" +#include "player/selfinfo.h" #include "spell/technic-info-table.h" #include "spell/spells2.h" #include "spell/spells3.h" diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c index 878d4480f..fd6509f4a 100644 --- a/src/mutation/mutation.c +++ b/src/mutation/mutation.c @@ -20,7 +20,7 @@ #include "cmd/cmd-dump.h" #include "mutation/mutation.h" -#include "selfinfo.h" +#include "player/selfinfo.h" #include "spell/spells-summon.h" #include "player/avatar.h" #include "player/player-status.h" diff --git a/src/selfinfo.c b/src/player/selfinfo.c similarity index 99% rename from src/selfinfo.c rename to src/player/selfinfo.c index 4e1724c31..99b4c5a42 100644 --- a/src/selfinfo.c +++ b/src/player/selfinfo.c @@ -15,6 +15,7 @@ */ #include "system/angband.h" +#include "player/selfinfo.h" #include "util.h" #include "player/player-status.h" diff --git a/src/selfinfo.h b/src/player/selfinfo.h similarity index 100% rename from src/selfinfo.h rename to src/player/selfinfo.h diff --git a/src/realm/realm-craft.c b/src/realm/realm-craft.c index 343b57fd9..084b2e3ea 100644 --- a/src/realm/realm-craft.c +++ b/src/realm/realm-craft.c @@ -2,7 +2,7 @@ #include "util.h" #include "cmd-spell.h" -#include "selfinfo.h" +#include "player/selfinfo.h" #include "spell/spells1.h" #include "spell/spells-object.h" #include "spell/spells-summon.h" diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c index 762db414d..ed098b5d1 100644 --- a/src/realm/realm-sorcery.c +++ b/src/realm/realm-sorcery.c @@ -2,7 +2,7 @@ #include "util.h" #include "cmd-spell.h" -#include "selfinfo.h" +#include "player/selfinfo.h" #include "player/avatar.h" #include "spell/spells-type.h" diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c index 90c776cb3..9243a32d3 100644 --- a/src/wizard/wizard-special-process.c +++ b/src/wizard/wizard-special-process.c @@ -25,7 +25,7 @@ #include "cmd/cmd-save.h" #include "util.h" #include "birth/birth.h" -#include "selfinfo.h" +#include "player/selfinfo.h" #include "player/patron.h" #include "mutation/mutation.h" #include "quest.h" -- 2.11.0