[Refactor] #38862 Moved selfinfo.c/h to player/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index a296c0c..01ad811 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -277,7 +277,7 @@
     <ClCompile Include="..\..\src\floor\floor-town.c" />\r
     <ClCompile Include="..\..\src\floor\floor.c" />\r
     <ClCompile Include="..\..\src\floor\geometry.c" />\r
-    <ClCompile Include="..\..\src\birtth\history.c" />\r
+    <ClCompile Include="..\..\src\birth\history.c" />\r
     <ClCompile Include="..\..\src\monster\horror-descriptions.c" />\r
     <ClCompile Include="..\..\src\init.c" />\r
     <ClCompile Include="..\..\src\io\gf-descriptions.c" />\r
@@ -481,7 +481,7 @@
     <ClCompile Include="..\..\src\market\rumor.c" />\r
     <ClCompile Include="..\..\src\io\save.c" />\r
     <ClCompile Include="..\..\src\scores.c" />\r
-    <ClCompile Include="..\..\src\selfinfo.c" />\r
+    <ClCompile Include="..\..\src\player\selfinfo.c" />\r
     <ClCompile Include="..\..\src\io\signal-handlers.c" />\r
     <ClCompile Include="..\..\src\snipe.c" />\r
     <ClCompile Include="..\..\src\sort.c" />\r
@@ -703,7 +703,7 @@
     <ClInclude Include="..\..\src\market\umor.h" />\r
     <ClInclude Include="..\..\src\io\save.h" />\r
     <ClInclude Include="..\..\src\scores.h" />\r
-    <ClInclude Include="..\..\src\selfinfo.h" />\r
+    <ClInclude Include="..\..\src\player\selfinfo.h" />\r
     <ClInclude Include="..\..\src\snipe.h" />\r
     <ClInclude Include="..\..\src\sort.h" />\r
     <ClInclude Include="..\..\src\spell\spells-diceroll.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index bd0ba0d..d586993 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -11,9 +11,6 @@
     <ClCompile Include="..\..\src\quest.c">
       <Filter>market</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\selfinfo.c">
-      <Filter>player</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\util.c">
       <Filter>core</Filter>
     </ClCompile>
@@ -830,7 +827,10 @@
     <ClCompile Include="..\..\src\mind\mind.c">
       <Filter>mind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\birtth\history.c">
+    <ClCompile Include="..\..\src\player\selfinfo.c">
+      <Filter>player</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\birth\history.c">
       <Filter>birth</Filter>
     </ClCompile>
   </ItemGroup>
@@ -844,9 +844,6 @@
     <ClInclude Include="..\..\src\quest.h">
       <Filter>market</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\selfinfo.h">
-      <Filter>player</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\util.h">
       <Filter>core</Filter>
     </ClInclude>
@@ -1711,6 +1708,9 @@
     <ClInclude Include="..\..\src\birtth\history.h">
       <Filter>birth</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\player\selfinfo.h">
+      <Filter>player</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index d1e6d0d..8bc4221 100644 (file)
--- 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 81746d2..5e72fc3 100644 (file)
--- 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 6724212..7b1875c 100644 (file)
--- 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 19bfff0..aebcb9c 100644 (file)
--- 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 878d448..fd6509f 100644 (file)
--- 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 4e1724c..99b4c5a 100644 (file)
--- 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 343b57f..084b2e3 100644 (file)
--- 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 762db41..ed098b5 100644 (file)
--- 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 90c776c..9243a32 100644 (file)
--- 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"