[Refactor] #38862 Moved player-*.c/h to player/ except for player-inventory.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 80052f4..371862a 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -324,15 +324,15 @@
     <ClCompile Include="..\..\src\object\object-broken.c" />\r
     <ClCompile Include="..\..\src\object\lite-processor.c" />\r
     <ClCompile Include="..\..\src\patron.c" />\r
-    <ClCompile Include="..\..\src\player-class.c" />\r
-    <ClCompile Include="..\..\src\player-damage.c" />\r
-    <ClCompile Include="..\..\src\player-effects.c" />\r
+    <ClCompile Include="..\..\src\player\player-class.c" />\r
+    <ClCompile Include="..\..\src\player\player-damage.c" />\r
+    <ClCompile Include="..\..\src\player\player-effects.c" />\r
     <ClCompile Include="..\..\src\player-inventory.c" />\r
-    <ClCompile Include="..\..\src\player-personality.c" />\r
-    <ClCompile Include="..\..\src\player-race.c" />\r
-    <ClCompile Include="..\..\src\player-sex.c" />\r
-    <ClCompile Include="..\..\src\player-skill.c" />\r
-    <ClCompile Include="..\..\src\player-status.c" />\r
+    <ClCompile Include="..\..\src\player\player-personality.c" />\r
+    <ClCompile Include="..\..\src\player\player-race.c" />\r
+    <ClCompile Include="..\..\src\player\player-sex.c" />\r
+    <ClCompile Include="..\..\src\player\player-skill.c" />\r
+    <ClCompile Include="..\..\src\player\player-status.c" />\r
     <ClCompile Include="..\..\src\player\mimic-info-table.c" />\r
     <ClCompile Include="..\..\src\player\permanent-resistances.c" />\r
     <ClCompile Include="..\..\src\player\process-name.c" />\r
@@ -443,7 +443,7 @@
     <ClInclude Include="..\..\src\character-dump.h" />\r
     <ClInclude Include="..\..\src\chest.h" />\r
     <ClInclude Include="..\..\src\chuukei.h" />\r
-    <ClCompile Include="..\..\src\player-move.c" />\r
+    <ClCompile Include="..\..\src\player\player-move.c" />\r
     <ClCompile Include="..\..\src\files.c" />\r
     <ClCompile Include="..\..\src\grid.c" />\r
     <ClCompile Include="..\..\src\inet.c" />\r
@@ -665,15 +665,15 @@
     <ClInclude Include="..\..\src\object\object-kind-hook.h" />\r
     <ClInclude Include="..\..\src\object\object-kind.h" />\r
     <ClInclude Include="..\..\src\patron.h" />\r
-    <ClInclude Include="..\..\src\player-class.h" />\r
-    <ClInclude Include="..\..\src\player-damage.h" />\r
-    <ClInclude Include="..\..\src\player-effects.h" />\r
-    <ClInclude Include="..\..\src\player-move.h" />\r
-    <ClInclude Include="..\..\src\player-personality.h" />\r
-    <ClInclude Include="..\..\src\player-race.h" />\r
-    <ClInclude Include="..\..\src\player-sex.h" />\r
-    <ClInclude Include="..\..\src\player-skill.h" />\r
-    <ClInclude Include="..\..\src\player-status.h" />\r
+    <ClInclude Include="..\..\src\player\player-class.h" />\r
+    <ClInclude Include="..\..\src\player\player-damage.h" />\r
+    <ClInclude Include="..\..\src\player\player-effects.h" />\r
+    <ClInclude Include="..\..\src\player\player-move.h" />\r
+    <ClInclude Include="..\..\src\player\player-personality.h" />\r
+    <ClInclude Include="..\..\src\player\player-race.h" />\r
+    <ClInclude Include="..\..\src\player\player-sex.h" />\r
+    <ClInclude Include="..\..\src\player\player-skill.h" />\r
+    <ClInclude Include="..\..\src\player\player-status.h" />\r
     <ClInclude Include="..\..\src\quest.h" />\r
     <ClInclude Include="..\..\src\racial.h" />\r
     <ClInclude Include="..\..\src\readdib.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 7be87b7..10feff1 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -27,15 +27,6 @@
     <ClCompile Include="..\..\src\patron.c">
       <Filter>player</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\player-damage.c">
-      <Filter>player</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\player-move.c">
-      <Filter>player</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\player-status.c">
-      <Filter>player</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\avatar.c">
       <Filter>player</Filter>
     </ClCompile>
@@ -70,9 +61,6 @@
     <ClCompile Include="..\..\src\chuukei.c">
       <Filter>io</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\player-effects.c">
-      <Filter>player</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\mspells4.c">
       <Filter>spell</Filter>
     </ClCompile>
@@ -103,24 +91,9 @@
     <ClCompile Include="..\..\src\mind.c">
       <Filter>spell</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\player-skill.c">
-      <Filter>player</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\player-class.c">
-      <Filter>player</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\monsterrace.c">
       <Filter>monster</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\player-race.c">
-      <Filter>player</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\player-personality.c">
-      <Filter>player</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\player-sex.c">
-      <Filter>player</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\history.c">
       <Filter>player</Filter>
     </ClCompile>
@@ -829,6 +802,33 @@
     <ClCompile Include="..\..\src\room\rooms-pit-nest.c">
       <Filter>room</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\player\player-class.c">
+      <Filter>player</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\player\player-damage.c">
+      <Filter>player</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\player\player-effects.c">
+      <Filter>player</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\player\player-move.c">
+      <Filter>player</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\player\player-personality.c">
+      <Filter>player</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\player\player-race.c">
+      <Filter>player</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\player\player-sex.c">
+      <Filter>player</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\player\player-skill.c">
+      <Filter>player</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\player\player-status.c">
+      <Filter>player</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -863,15 +863,6 @@
     <ClInclude Include="..\..\src\patron.h">
       <Filter>player</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\player-damage.h">
-      <Filter>player</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\player-move.h">
-      <Filter>player</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\player-status.h">
-      <Filter>player</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\avatar.h">
       <Filter>player</Filter>
     </ClInclude>
@@ -902,9 +893,6 @@
     <ClInclude Include="..\..\src\chuukei.h">
       <Filter>io</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\player-effects.h">
-      <Filter>player</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\monster-spell.h">
       <Filter>spell</Filter>
     </ClInclude>
@@ -920,24 +908,9 @@
     <ClInclude Include="..\..\src\mind.h">
       <Filter>spell</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\player-skill.h">
-      <Filter>player</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\player-class.h">
-      <Filter>player</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\monsterrace.h">
       <Filter>monster</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\player-race.h">
-      <Filter>player</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\player-personality.h">
-      <Filter>player</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\player-sex.h">
-      <Filter>player</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\angband.h">
       <Filter>core</Filter>
     </ClInclude>
@@ -1691,6 +1664,33 @@
     <ClInclude Include="..\..\src\room\rooms-vault.h">
       <Filter>room</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\player\player-class.h">
+      <Filter>player</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\player\player-damage.h">
+      <Filter>player</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\player\player-effects.h">
+      <Filter>player</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\player\player-move.h">
+      <Filter>player</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\player\player-personality.h">
+      <Filter>player</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\player\player-race.h">
+      <Filter>player</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\player\player-sex.h">
+      <Filter>player</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\player\player-skill.h">
+      <Filter>player</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\player\player-status.h">
+      <Filter>player</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/angband.h b/src/angband.h
index 7feb09f..7760193 100644 (file)
--- a/src/angband.h
+++ b/src/angband.h
@@ -42,7 +42,7 @@
 #include "monster.h"
 #include "monsterrace.h"
 #include "object/object.h"
-#include "player-status.h"
+#include "player/player-status.h"
 
 
 /***** Some copyright messages follow below *****/

diff --git a/src/artifact.c b/src/artifact.c
index 7b75f84..b51560c 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -31,8 +31,8 @@
 #include "grid.h"
 #include "monster.h"
 #include "view/display-main-window.h"
-#include "player-class.h"
-#include "player-personality.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
 #include "world/world.h"
 
  /*

diff --git a/src/autopick/autopick-destroyer.c b/src/autopick/autopick-destroyer.c
index 82e434d..b618117 100644 (file)
--- a/src/autopick/autopick-destroyer.c
+++ b/src/autopick/autopick-destroyer.c
@@ -11,7 +11,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
-#include "player-move.h"
+#include "player/player-move.h"
 
 
 /*!

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index 6840cf1..de10014 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -18,7 +18,7 @@
 #include "autopick/autopick-destroyer.h"
 #include "autopick/autopick-finder.h"
 #include "autopick/autopick.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "object/object-flavor.h"
 
 /*

diff --git a/src/avatar.c b/src/avatar.c
index ab1e3a2..664ba2c 100644 (file)
--- a/src/avatar.c
+++ b/src/avatar.c
@@ -16,8 +16,8 @@
 #include "angband.h"
 #include "avatar.h"
 #include "realm/realm.h"
-#include "player-race.h"
-#include "player-class.h"
+#include "player/player-race.h"
+#include "player/player-class.h"
 
 /*!
  * 徳の名称 / The names of the virtues

diff --git a/src/birth/birth-explanations-table.h b/src/birth/birth-explanations-table.h
index ca52a73..c1fe6d3 100644 (file)
--- a/src/birth/birth-explanations-table.h
+++ b/src/birth/birth-explanations-table.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "player-personality.h"
+#include "player/player-personality.h"
 
 extern concptr race_explanations[MAX_RACES];
 extern concptr class_explanations[MAX_CLASS];

diff --git a/src/birth/birth.c b/src/birth/birth.c
index 6a4cd17..f31e8eb 100644 (file)
--- a/src/birth/birth.c
+++ b/src/birth/birth.c
@@ -43,11 +43,11 @@
 #include "object/object-ego.h"
 #include "object/object-kind.h"
 #include "patron.h"
-#include "player-class.h"
-#include "player-personality.h"
-#include "player-sex.h"
-#include "player-skill.h"
-#include "player-status.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
+#include "player/player-sex.h"
+#include "player/player-skill.h"
+#include "player/player-status.h"
 #include "player/process-name.h"
 #include "player/race-info-table.h"
 #include "quest.h"

diff --git a/src/chest.c b/src/chest.c
index d478a7c..2eb9da3 100644 (file)
--- a/src/chest.c
+++ b/src/chest.c
@@ -6,10 +6,10 @@
 #include "spells-summon.h"
 #include "floor/floor.h"
 #include "trap.h"
-#include "player-status.h"
-#include "player-damage.h"
-#include "player-class.h"
-#include "player-effects.h"
+#include "player/player-status.h"
+#include "player/player-damage.h"
+#include "player/player-class.h"
+#include "player/player-effects.h"
 #include "grid.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index 84060fd..0e76253 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -20,9 +20,9 @@
 #include "spells-status.h"
 #include "spells-object.h"
 #include "spells-floor.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "realm/realm-hex.h"
-#include "player-damage.h"
+#include "player/player-damage.h"
 #include "player-inventory.h"
 #include "monster-status.h"
 #include "files.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index cc53f4a..64a5921 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -29,14 +29,14 @@
 #include "quest.h"
 #include "artifact.h"
 #include "avatar.h"
-#include "player-status.h"
+#include "player/player-status.h"
 #include "realm/realm-hex.h"
 #include "geometry.h"
 #include "wild.h"
 #include "grid.h"
-#include "player-move.h"
-#include "player-effects.h"
-#include "player-personality.h"
+#include "player/player-move.h"
+#include "player/player-effects.h"
+#include "player/player-personality.h"
 #include "player-inventory.h"
 #include "object/object-kind.h"
 #include "object/object-broken.h"

diff --git a/src/cmd/cmd-diary.c b/src/cmd/cmd-diary.c
index 92e0046..339cddf 100644 (file)
--- a/src/cmd/cmd-diary.c
+++ b/src/cmd/cmd-diary.c
@@ -4,7 +4,7 @@
 #include "core/show-file.h"
 #include "files.h"
 #include "cmd/diary-subtitle-table.h"
-#include "player-personality.h"
+#include "player/player-personality.h"
 #include "io/write-diary.h"
 #include "world/world.h"
 

diff --git a/src/cmd/cmd-draw.c b/src/cmd/cmd-draw.c
index c2ea067..bb3e86c 100644 (file)
--- a/src/cmd/cmd-draw.c
+++ b/src/cmd/cmd-draw.c
@@ -4,7 +4,7 @@
 #include "files.h"
 #include "gameterm.h"
 #include "view/display-main-window.h" // 暫定。後で消す.
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "view/display-player.h" // 暫定。後で消す.
 #include "player/process-name.h"
 

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index bcb71d3..6f561d7 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -41,7 +41,7 @@
 
 #include "world/world.h"
 #include "view/display-player.h" // 暫定。後で消す.
-#include "player-personality.h"
+#include "player/player-personality.h"
 #include "quest.h"
 #include "artifact.h"
 #include "floor/floor-town.h"

diff --git a/src/cmd/cmd-eat.c b/src/cmd/cmd-eat.c
index c8c9b3b..ed56c87 100644 (file)
--- a/src/cmd/cmd-eat.c
+++ b/src/cmd/cmd-eat.c
@@ -16,11 +16,11 @@
 #include "avatar.h"
 #include "spells-status.h"
 #include "realm/realm-hex.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-damage.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-damage.h"
 #include "player/mimic-info-table.h"
-#include "player-class.h"
+#include "player/player-class.h"
 #include "player-inventory.h"
 #include "floor/floor.h"
 #include "object/object-kind.h"

diff --git a/src/cmd/cmd-hissatsu.c b/src/cmd/cmd-hissatsu.c
index 5a6f0f7..b78f6f7 100644 (file)
--- a/src/cmd/cmd-hissatsu.c
+++ b/src/cmd/cmd-hissatsu.c
@@ -16,8 +16,8 @@
 #include "main/sound-definitions-table.h"
 
 #include "monsterrace-hook.h"
-#include "player-status.h"
-#include "player-effects.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
 #include "player-inventory.h"
 #include "spell/technic-info-table.h"
 

diff --git a/src/cmd/cmd-inn.c b/src/cmd/cmd-inn.c
index fc2fccc..504a7bd 100644 (file)
--- a/src/cmd/cmd-inn.c
+++ b/src/cmd/cmd-inn.c
@@ -3,7 +3,7 @@
 #include "cmd/cmd-magiceat.h"
 #include "io/write-diary.h"
 #include "world/world.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "core/turn-compensator.h"
 #include "rumor.h"
 

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index 9b554b3..d0e060c 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -34,10 +34,10 @@
 #include "quest.h"
 #include "artifact.h"
 #include "avatar.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-class.h"
-#include "player-personality.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
 #include "monster.h"
 #include "view/display-main-window.h"
 #include "spell/spells3.h"
@@ -46,7 +46,7 @@
 #include "autopick/autopick-registry.h"
 #include "targeting.h"
 #include "snipe.h"
-#include "player-race.h"
+#include "player/player-race.h"
 #include "view/display-main-window.h"
 #include "player-inventory.h"
 

diff --git a/src/cmd/cmd-magiceat.c b/src/cmd/cmd-magiceat.c
index 2b3ca8f..ef6b0d8 100644 (file)
--- a/src/cmd/cmd-magiceat.c
+++ b/src/cmd/cmd-magiceat.c
@@ -63,9 +63,9 @@
 #include "cmd-zapwand.h"
 #include "cmd-magiceat.h"
 #include "avatar.h"
-#include "player-status.h"
+#include "player/player-status.h"
 #include "spell/spells3.h"
-#include "player-class.h"
+#include "player/player-class.h"
 #include "object/object-kind.h"
 #include "targeting.h"
 

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index 2c8e090..0c27ae1 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -23,8 +23,8 @@
 #include "monster-spell.h"
 #include "monster-process.h"
 #include "cmd-spell.h"
-#include "player-status.h"
-#include "player-effects.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
 #include "cmd-basic.h"
 #include "targeting.h"
 #include "view/display-main-window.h"

diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c
index 4a40b7e..13c4259 100644 (file)
--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -8,12 +8,12 @@
 #include "grid.h"
 #include "melee.h"
 #include "sort.h"
-#include "player-move.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-skill.h"
-#include "player-class.h"
-#include "player-damage.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-skill.h"
+#include "player/player-class.h"
+#include "player/player-damage.h"
 #include "object/object-hook.h"
 #include "monster.h"
 #include "monster-status.h"

diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c
index dbc7e30..6b92c35 100644 (file)
--- a/src/cmd/cmd-quaff.c
+++ b/src/cmd/cmd-quaff.c
@@ -18,9 +18,9 @@
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "spells-status.h"
-#include "player-effects.h"
-#include "player-status.h"
-#include "player-damage.h"
+#include "player/player-effects.h"
+#include "player/player-status.h"
+#include "player/player-damage.h"
 #include "player/mimic-info-table.h"
 #include "player-inventory.h"
 #include "realm/realm-hex.h"
@@ -30,7 +30,7 @@
 #include "floor/floor.h"
 #include "object/object-kind.h"
 #include "view/display-main-window.h"
-#include "player-class.h"
+#include "player/player-class.h"
 
 /*!
  * @brief 薬を飲むコマンドのサブルーチン /

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index cfa79ac..5521896 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -14,10 +14,10 @@
 #include "object/object-hook.h"
 #include "artifact.h"
 #include "avatar.h"
-#include "player-status.h"
-#include "player-damage.h"
-#include "player-class.h"
-#include "player-effects.h"
+#include "player/player-status.h"
+#include "player/player-damage.h"
+#include "player/player-class.h"
+#include "player/player-effects.h"
 #include "player-inventory.h"
 #include "rumor.h"
 #include "realm/realm-hex.h"

diff --git a/src/cmd/cmd-save.c b/src/cmd/cmd-save.c
index 1d4c1b9..db7a244 100644 (file)
--- a/src/cmd/cmd-save.c
+++ b/src/cmd/cmd-save.c
@@ -2,7 +2,7 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-save.h"
 #include "cmd/cmd-dump.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "core/stuff-handler.h"
 #include "save.h"
 #include "world/world.h"

diff --git a/src/cmd/cmd-smith.c b/src/cmd/cmd-smith.c
index de22b95..06b8b8b 100644 (file)
--- a/src/cmd/cmd-smith.c
+++ b/src/cmd/cmd-smith.c
@@ -5,7 +5,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-ego.h"
-#include "player-status.h"
+#include "player/player-status.h"
 #include "cmd-basic.h"
 #include "cmd-smith.h"
 #include "object/object-kind.h"

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index 4ab99d9..1a6df00 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -22,11 +22,11 @@
 #include "realm/realm-hex.h"
 #include "mind.h"
 #include "avatar.h"
-#include "player-damage.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-skill.h"
-#include "player-class.h"
+#include "player/player-damage.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-skill.h"
+#include "player/player-class.h"
 #include "player-inventory.h"
 #include "object/object-hook.h"
 #include "cmd-basic.h"

diff --git a/src/cmd/cmd-usestaff.c b/src/cmd/cmd-usestaff.c
index e108241..17801da 100644 (file)
--- a/src/cmd/cmd-usestaff.c
+++ b/src/cmd/cmd-usestaff.c
@@ -2,12 +2,12 @@
 #include "util.h"
 #include "main/sound-definitions-table.h"
 
-#include "player-race.h"
+#include "player/player-race.h"
 #include "spells-summon.h"
 #include "avatar.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-class.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-class.h"
 #include "player-inventory.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"

diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c
index 2379df6..3ab9023 100644 (file)
--- a/src/cmd/cmd-zaprod.c
+++ b/src/cmd/cmd-zaprod.c
@@ -3,9 +3,9 @@
 #include "main/sound-definitions-table.h"
 
 #include "avatar.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-class.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-class.h"
 #include "player-inventory.h"
 #include "object/object-kind.h"
 #include "object/object-hook.h"

diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c
index 7052f5c..ee76bc6 100644 (file)
--- a/src/cmd/cmd-zapwand.c
+++ b/src/cmd/cmd-zapwand.c
@@ -5,9 +5,9 @@
 #include "avatar.h"
 #include "spell/spells-type.h"
 #include "spells-status.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-class.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-class.h"
 #include "player-inventory.h"
 #include "object/object-kind.h"
 #include "object/object-hook.h"

diff --git a/src/combat/melee.c b/src/combat/melee.c
index 549e9ae..fd55c4b 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -35,14 +35,14 @@
 #include "spell/process-effect.h"
 #include "spell/spells-type.h"
 #include "files.h"
-#include "player-move.h"
-#include "player-effects.h"
-#include "player-skill.h"
-#include "player-damage.h"
-#include "player-status.h"
+#include "player/player-move.h"
+#include "player/player-effects.h"
+#include "player/player-skill.h"
+#include "player/player-damage.h"
+#include "player/player-status.h"
 #include "player/mimic-info-table.h"
-#include "player-class.h"
-#include "player-personality.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 #include "spells-floor.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 202bdeb..a4cb31f 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -9,10 +9,10 @@
 #include "monster-spell.h"
 #include "artifact.h"
 #include "avatar.h"
-#include "player-status.h"
-#include "player-skill.h"
-#include "player-class.h"
-#include "player-personality.h"
+#include "player/player-status.h"
+#include "player/player-skill.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
 #include "object/object-hook.h"
 #include "object/object-broken.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 4cac6a8..f1113f1 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -32,11 +32,11 @@
 #include "market/store-util.h"
 #include "market/store.h"
 #include "object/object-flavor.h"
-#include "player-class.h"
-#include "player-effects.h"
-#include "player-personality.h"
-#include "player-race.h"
-#include "player-skill.h"
+#include "player/player-class.h"
+#include "player/player-effects.h"
+#include "player/player-personality.h"
+#include "player/player-race.h"
+#include "player/player-skill.h"
 #include "player/process-name.h"
 #include "spell/technic-info-table.h"
 #include "spells-status.h"

diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c
index 47fd2b9..a06f186 100644 (file)
--- a/src/core/hp-mp-processor.c
+++ b/src/core/hp-mp-processor.c
@@ -1,11 +1,11 @@
 #include "angband.h"
 #include "core/hp-mp-processor.h"
 #include "realm/realm-song.h"
-#include "player-damage.h"
+#include "player/player-damage.h"
 #include "object/object-flavor.h"
 #include "object/object-ego.h"
 #include "world/world.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "floor/pattern-walk.h"
 #include "core/hp-mp-regenerator.h"
 #include "cmd/cmd-pet.h"

diff --git a/src/core/magic-effects-timeout-reducer.c b/src/core/magic-effects-timeout-reducer.c
index 1e4097f..7923a47 100644 (file)
--- a/src/core/magic-effects-timeout-reducer.c
+++ b/src/core/magic-effects-timeout-reducer.c
@@ -1,6 +1,6 @@
 #include "angband.h"
 #include "core/magic-effects-timeout-reducer.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 
 /*!
  * @brief 10ゲームターンが進行するごとに魔法効果の残りターンを減らしていく処理

diff --git a/src/core/player-processor.c b/src/core/player-processor.c
index 45ef017..35fa71f 100644 (file)
--- a/src/core/player-processor.c
+++ b/src/core/player-processor.c
@@ -1,14 +1,14 @@
 #include "angband.h"
 #include "core/player-processor.h"
-#include "player-move.h"
-#include "player-skill.h"
+#include "player/player-move.h"
+#include "player/player-skill.h"
 #include "core/special-internal-keys.h"
 #include "mutation/mutation.h"
 #include "spell/spells2.h" // 相互依存している。後でどうするか検討する.
 #include "monster-status.h"
 #include "view/display-main-window.h"
 #include "creature.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "core/stuff-handler.h"
 #include "inventory/pack-overflow.h"
 #include "io/input-key-processor.h"

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index bd35319..e0fac79 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -44,8 +44,8 @@
 #include "quest.h"
 #include "monster.h"
 #include "files.h"
-#include "player-skill.h"
-#include "player-race.h"
+#include "player/player-skill.h"
+#include "player/player-race.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "market/building.h"
@@ -63,7 +63,7 @@
 #include "gameterm.h"
 #include "wild.h"
 #include "view/display-main-window.h"
-#include "player-class.h"
+#include "player/player-class.h"
 
 #include "init.h"
 

diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c
index c616833..790d2a2 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -8,11 +8,11 @@
 #include "io/write-diary.h"
 #include "realm/realm-song.h"
 #include "core/hp-mp-regenerator.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "view/display-main-window.h"
 #include "core/stuff-handler.h"
 #include "cmd/cmd-dump.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "monster-process.h"
 #include "monster-status.h"
 #include "world/world-turn-processor.h"

diff --git a/src/effect/effect-feature.c b/src/effect/effect-feature.c
index ff18646..e6df9fd 100644 (file)
--- a/src/effect/effect-feature.c
+++ b/src/effect/effect-feature.c
@@ -4,7 +4,7 @@
 #include "dungeon/dungeon.h"
 #include "main/sound-definitions-table.h"
 #include "trap.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "world/world.h"
 #include "spell/spells-type.h"
 #include "spell/process-effect.h" // 暫定、後で消す.

diff --git a/src/effect/effect-monster-domination.c b/src/effect/effect-monster-domination.c
index e226b7c..bf7398e 100644 (file)
--- a/src/effect/effect-monster-domination.c
+++ b/src/effect/effect-monster-domination.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-domination.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "spells-diceroll.h"
 #include "monster-status.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/effect/effect-monster-psi.c b/src/effect/effect-monster-psi.c
index abc633e..b844924 100644 (file)
--- a/src/effect/effect-monster-psi.c
+++ b/src/effect/effect-monster-psi.c
@@ -1,9 +1,9 @@
 #include "angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-psi.h"
-#include "player-damage.h"
+#include "player/player-damage.h"
 #include "world/world.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 
 static bool effect_monster_psi_empty_mind(player_type *caster_ptr, effect_monster_type *em_ptr)
 {

diff --git a/src/effect/effect-monster-spirit.c b/src/effect/effect-monster-spirit.c
index 32517fb..24bc0ae 100644 (file)
--- a/src/effect/effect-monster-spirit.c
+++ b/src/effect/effect-monster-spirit.c
@@ -3,7 +3,7 @@
 #include "effect/effect-monster-spirit.h"
 #include "monster-spell.h"
 #include "monster-status.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 
 gf_switch_result effect_monster_drain_mana(player_type *caster_ptr, effect_monster_type *em_ptr)
 {

diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c
index e46fcad..f19ed6f 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -9,7 +9,7 @@
 #include "angband.h"
 #include "effect-monster-util.h"
 #include "effect/effect-monster-switcher.h"
-#include "player-damage.h"
+#include "player/player-damage.h"
 #include "avatar.h"
 #include "monster-status.h"
 #include "monsterrace-hook.h"

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index ffc973b..6070b60 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -9,7 +9,7 @@
 #include "spells-effect-util.h"
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "core/stuff-handler.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-switcher.h"

diff --git a/src/effect/effect-player-curse.c b/src/effect/effect-player-curse.c
index 0f6c8ed..d53b6d1 100644 (file)
--- a/src/effect/effect-player-curse.c
+++ b/src/effect/effect-player-curse.c
@@ -1,11 +1,11 @@
 #include "angband.h"
 #include "effect/effect-player-util.h"
 #include "effect/effect-player-curse.h"
-#include "player-damage.h"
+#include "player/player-damage.h"
 #include "world/world.h"
 #include "monster-spell.h"
 #include "object/object-curse.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 
 void effect_player_curse_1(player_type *target_ptr,
                            effect_player_type *ep_ptr) {

diff --git a/src/effect/effect-player-oldies.c b/src/effect/effect-player-oldies.c
index 4553b4b..e5da4fe 100644 (file)
--- a/src/effect/effect-player-oldies.c
+++ b/src/effect/effect-player-oldies.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "effect/effect-player-util.h"
 #include "effect/effect-player-oldies.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 
 void effect_player_old_heal(player_type *target_ptr,
                             effect_player_type *ep_ptr) {

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index 7811e5e..9183fc8 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -1,11 +1,11 @@
 #include "angband.h"
 #include "effect/effect-player-util.h"
 #include "effect/effect-player-resist-hurt.h"
-#include "player-damage.h"
+#include "player/player-damage.h"
 #include "world/world.h"
 #include "object/object-broken.h"
 #include "artifact.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "mutation/mutation.h"
 #include "monster-spell.h"
 #include "spells-status.h"

diff --git a/src/effect/effect-player-spirit.c b/src/effect/effect-player-spirit.c
index 1304e3a..dff4921 100644 (file)
--- a/src/effect/effect-player-spirit.c
+++ b/src/effect/effect-player-spirit.c
@@ -2,8 +2,8 @@
 #include "effect/effect-player-util.h"
 #include "effect/effect-player-spirit.h"
 #include "monster-spell.h"
-#include "player-damage.h"
-#include "player-effects.h"
+#include "player/player-damage.h"
+#include "player/player-effects.h"
 #include "world/world.h"
 
 void effect_player_drain_mana(player_type *target_ptr,

diff --git a/src/effect/effect-player-switcher.c b/src/effect/effect-player-switcher.c
index c4b42c5..8450e6f 100644 (file)
--- a/src/effect/effect-player-switcher.c
+++ b/src/effect/effect-player-switcher.c
@@ -8,8 +8,8 @@
 #include "monster-spell.h"
 #include "object/object-broken.h"
 #include "object/object-curse.h"
-#include "player-damage.h"
-#include "player-effects.h"
+#include "player/player-damage.h"
+#include "player/player-effects.h"
 #include "player/mimic-info-table.h"
 #include "spell/spells-type.h"
 #include "world/world.h"

diff --git a/src/effect/effect-player.c b/src/effect/effect-player.c
index 6e7e623..304ead0 100644 (file)
--- a/src/effect/effect-player.c
+++ b/src/effect/effect-player.c
@@ -12,10 +12,10 @@
 #include "main/sound-definitions-table.h"
 #include "realm/realm-hex.h"
 #include "effect/spells-effect-util.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "effect/effect-characteristics.h"
 
 typedef enum effect_player_check_result

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index 2420390..d5ca9dd 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -9,9 +9,9 @@
 #include "monster-status.h"
 #include "quest.h"
 #include "object/object-hook.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "world/world.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "object/object-kind.h"
 #include "object/object-ego.h"
 #include "cmd-dump.h"

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index b1df812..a79c536 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -117,7 +117,7 @@
 #include "trap.h"
 #include "monster.h"
 #include "quest.h"
-#include "player-status.h"
+#include "player/player-status.h"
 #include "wild.h"
 #include "monster-status.h"
 #include "dungeon/dungeon-file.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 4b4e98e..2d1238f 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -35,9 +35,9 @@
 #include "cmd-basic.h"
 #include "io/uid-checker.h"
 #include "files.h"
-#include "player-effects.h"
-#include "player-class.h"
-#include "player-personality.h"
+#include "player/player-effects.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
 #include "world/world.h"
 #include "spell/spells2.h"
 #include "io/write-diary.h"

diff --git a/src/floor/floor.c b/src/floor/floor.c
index f21c585..7729739 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -8,7 +8,7 @@
 #include "quest.h"
 #include "object/object-hook.h"
 #include "world/world.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "object/object.h"
 #include "artifact.h"
 #include "object/object-kind.h"

diff --git a/src/floor/pattern-walk.c b/src/floor/pattern-walk.c
index 970ec5c..a52251e 100644 (file)
--- a/src/floor/pattern-walk.c
+++ b/src/floor/pattern-walk.c
@@ -2,10 +2,10 @@
 #include "floor/pattern-walk.h"
 #include "dungeon/dungeon.h"
 #include "io/write-diary.h"
-#include "player-move.h"
-#include "player-effects.h"
+#include "player/player-move.h"
+#include "player/player-effects.h"
 #include "spells-status.h"
-#include "player-damage.h"
+#include "player/player-damage.h"
 #include "realm/realm-song.h"
 #include "spell/spells3.h"
 #include "cmd/cmd-save.h"

diff --git a/src/grid.c b/src/grid.c
index 8a81622..c29b270 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -31,9 +31,9 @@
 #include "quest.h"
 #include "feature.h"
 #include "monster-status.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-class.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-class.h"
 #include "view/display-main-window.h"
 #include "realm/realm-song.h"
 #include "spell/process-effect.h"

diff --git a/src/init.c b/src/init.c
index 1750ba8..9993fb9 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -54,8 +54,8 @@
 #include "floor/floor-town.h"
 #include "dungeon/dungeon.h"
 #include "room/rooms-vault.h"
-#include "player-skill.h"
-#include "player-class.h"
+#include "player/player-skill.h"
+#include "player/player-class.h"
 #include "object/object-kind.h"
 #include "object/object-ego.h"
 #include "room/rooms-vault.h"

diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c
index 7738571..6ab6598 100644 (file)
--- a/src/inventory/inventory-curse.c
+++ b/src/inventory/inventory-curse.c
@@ -2,15 +2,15 @@
 #include "inventory/inventory-curse.h"
 #include "object/object-flavor.h"
 #include "spells-summon.h"
-#include "player-damage.h"
-#include "player-move.h"
+#include "player/player-damage.h"
+#include "player/player-move.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "files.h"
 #include "object/object-curse.h"
 #include "artifact.h"
 #include "object/object-hook.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "object/object-kind.h"
 
 static bool is_specific_curse(BIT_FLAGS flag)

diff --git a/src/inventory/pack-overflow.c b/src/inventory/pack-overflow.c
index be791b6..f5939ec 100644 (file)
--- a/src/inventory/pack-overflow.c
+++ b/src/inventory/pack-overflow.c
@@ -1,6 +1,6 @@
 #include "angband.h"
 #include "inventory/pack-overflow.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "object/object-flavor.h"
 #include "core/stuff-handler.h"
 

diff --git a/src/inventory/recharge-processor.c b/src/inventory/recharge-processor.c
index 32bf25e..2171507 100644 (file)
--- a/src/inventory/recharge-processor.c
+++ b/src/inventory/recharge-processor.c
@@ -1,6 +1,6 @@
 #include "angband.h"
 #include "object/object-flavor.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "core/hp-mp-regenerator.h"
 #include "object/object-kind.h"
 #include "object/object-hook.h"

diff --git a/src/inventory/simple-appraiser.c b/src/inventory/simple-appraiser.c
index 666b498..2c9b97b 100644 (file)
--- a/src/inventory/simple-appraiser.c
+++ b/src/inventory/simple-appraiser.c
@@ -4,7 +4,7 @@
 #include "avatar.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "player-inventory.h"
 #include "autopick/autopick.h"
 

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 79649d7..d1bde2e 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -16,7 +16,7 @@
 #include "main/sound-definitions-table.h"
 #include "io/write-diary.h"
 #include "player-inventory.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "market/store.h" // do_cmd_store() がある。後で移設する.
 #include "quest.h" // do_cmd_quest() がある。後で移設する.
 #include "wild.h"
@@ -28,7 +28,7 @@
 #include "knowledge/knowledge-autopick.h"
 #include "knowledge/knowledge-quests.h"
 #include "chuukei.h"
-#include "player-move.h" // do_cmd_travel() がある。後で移設する.
+#include "player/player-move.h" // do_cmd_travel() がある。後で移設する.
 #include "files.h"
 
 #include "cmd/cmd-activate.h"

diff --git a/src/knowledge/knowledge-experiences.c b/src/knowledge/knowledge-experiences.c
index 636e9ab..f907ce6 100644 (file)
--- a/src/knowledge/knowledge-experiences.c
+++ b/src/knowledge/knowledge-experiences.c
@@ -10,7 +10,7 @@
 #include "core/show-file.h"
 #include "object/object-flavor.h"
 #include "object/object-kind.h"
-#include "player-skill.h"
+#include "player/player-skill.h"
 #include "spell/technic-info-table.h"
 #include "spell/spells-util.h"
 #include "spell/spells-execution.h"

diff --git a/src/load.c b/src/load.c
index f8356b0..d4c4741 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -74,11 +74,11 @@
 #include "dungeon/dungeon-file.h"
 #include "io/uid-checker.h"
 #include "files.h"
-#include "player-skill.h"
-#include "player-class.h"
+#include "player/player-skill.h"
+#include "player/player-class.h"
 #include "player/race-info-table.h"
-#include "player-personality.h"
-#include "player-sex.h"
+#include "player/player-personality.h"
+#include "player/player-sex.h"
 #include "birth/birth.h"
 #include "world/world.h"
 #include "object/object-kind.h"

diff --git a/src/market/building.c b/src/market/building.c
index 743a99e..3a67b4b 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -52,10 +52,10 @@
 #include "dungeon/dungeon-file.h"
 
 #include "files.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-class.h"
-#include "player-personality.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
 #include "player-inventory.h"
 #include "scores.h"
 #include "shoot.h"

diff --git a/src/market/building.h b/src/market/building.h
index 140fd0c..29d6c44 100644 (file)
--- a/src/market/building.h
+++ b/src/market/building.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "realm/realm.h"
-#include "player-race.h"
+#include "player/player-race.h"
 #include "player/race-info-table.h"
-#include "player-class.h"
+#include "player/player-class.h"
 
 #define MAX_BLDG 32 /*!< 施設の種類最大数 / Number of buildings */
 

diff --git a/src/market/store.c b/src/market/store.c
index 1eaa144..4bc6ba1 100644 (file)
--- a/src/market/store.c
+++ b/src/market/store.c
@@ -43,15 +43,15 @@
 #include "avatar.h"
 #include "cmd-spell.h"
 #include "rumor.h"
-#include "player-status.h"
-#include "player-class.h"
+#include "player/player-status.h"
+#include "player/player-class.h"
 #include "player-inventory.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "floor/floor-events.h"
 #include "snipe.h"
 #include "files.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "player/race-info-table.h"
 #include "mind.h"
 #include "world/world.h"

diff --git a/src/mind.c b/src/mind.c
index 2002ad4..2200202 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -25,9 +25,9 @@
 #include "melee.h"
 #include "spells-summon.h"
 #include "avatar.h"
-#include "player-move.h"
-#include "player-status.h"
-#include "player-class.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
+#include "player/player-class.h"
 #include "spells-status.h"
 #include "cmd-spell.h"
 #include "spells-floor.h"
@@ -35,8 +35,8 @@
 #include "grid.h"
 #include "cmd-basic.h"
 #include "monster-status.h"
-#include "player-effects.h"
-#include "player-damage.h"
+#include "player/player-effects.h"
+#include "player/player-damage.h"
 #include "view/display-main-window.h"
 #include "targeting.h"
 #include "realm/realm-song.h"

diff --git a/src/monster-process.c b/src/monster-process.c
index 7bf4cfc..98e79df 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -32,7 +32,7 @@
 #include "realm/realm-hex.h"
 #include "feature.h"
 #include "grid.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "monster-status.h"
 #include "monster-spell.h"
 #include "monster-process.h"

diff --git a/src/monster-status.c b/src/monster-status.c
index 29e099a..e1ac463 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -22,8 +22,8 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "files.h"
-#include "player-effects.h"
-#include "player-personality.h"
+#include "player/player-effects.h"
+#include "player/player-personality.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 #include "report.h"

diff --git a/src/monster/monster-move.c b/src/monster/monster-move.c
index 6cf0f1e..be5646c 100644 (file)
--- a/src/monster/monster-move.c
+++ b/src/monster/monster-move.c
@@ -12,7 +12,7 @@
 #include "creature.h"
 #include "files.h"
 #include "monster-status.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "spell/spells-type.h"
 #include "spell/process-effect.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/monster/monster-runaway.c b/src/monster/monster-runaway.c
index 95ccd05..4c1a492 100644 (file)
--- a/src/monster/monster-runaway.c
+++ b/src/monster/monster-runaway.c
@@ -5,7 +5,7 @@
  */
 
 #include "monster/monster-runaway.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "cmd/cmd-pet.h"
 #include "quest.h"
 

diff --git a/src/monster/monster-update.c b/src/monster/monster-update.c
index 5e9dedb..67288fe 100644 (file)
--- a/src/monster/monster-update.c
+++ b/src/monster/monster-update.c
@@ -5,7 +5,7 @@
  */
 
 #include "monster/monster-update.h"
-#include "player-move.h"
+#include "player/player-move.h"
 
 /*!
  * @brief 騎乗中のモンスター情報を更新する

diff --git a/src/monster1.c b/src/monster1.c
index bba915c..4df9a4c 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -21,7 +21,7 @@
 #include "cmd-pet.h"
 #include "effect/effect-characteristics.h"
 #include "object/object-kind-hook.h"
-#include "player-personality.h"
+#include "player/player-personality.h"
 #include "monster.h"
 #include "monster-spell.h"
 #include "monsterrace-hook.h"
@@ -36,7 +36,7 @@
 #include "melee.h"
 #include "japanese.h"
 #include "view/display-main-window.h"
-#include "player-class.h"
+#include "player/player-class.h"
 #include "english.h"
 #include "market/arena-info-table.h"
 #include "spell/process-effect.h"

diff --git a/src/monster2.c b/src/monster2.c
index d4caf51..d349b5e 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -28,11 +28,11 @@
 #include "spells-summon.h"
 #include "quest.h"
 #include "grid.h"
-#include "player-move.h"
-#include "player-status.h"
-#include "player-race.h"
-#include "player-class.h"
-#include "player-personality.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
+#include "player/player-race.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
 #include "wild.h"
 #include "warning.h"
 #include "monster-spell.h"

diff --git a/src/mspells1.c b/src/mspells1.c
index 3a03e74..b448ccb 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -47,16 +47,16 @@
 #include "object/object-curse.h"
 #include "quest.h"
 #include "realm/realm-hex.h"
-#include "player-move.h"
-#include "player-status.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
 #include "monster.h"
 #include "monster-spell.h"
 #include "spell/spells-type.h"
 #include "world/world.h"
 #include "realm/realm-song.h"
 #include "view/display-main-window.h"
-#include "player-race.h"
-#include "player-class.h"
+#include "player/player-race.h"
+#include "player/player-class.h"
 #include "spell/process-effect.h"
 #include "spell/spells3.h"
 

diff --git a/src/mspells2.c b/src/mspells2.c
index 4b46734..7182f49 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -20,8 +20,8 @@
 #include "grid.h"
 #include "quest.h"
 #include "realm/realm-hex.h"
-#include "player-move.h"
-#include "player-class.h"
+#include "player/player-move.h"
+#include "player/player-class.h"
 #include "monster.h"
 #include "monster-status.h"
 #include "monster-spell.h"

diff --git a/src/mspells3.c b/src/mspells3.c
index fb2fbcf..c94a972 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -21,12 +21,12 @@
 #include "avatar.h"
 #include "spells-status.h"
 #include "cmd-spell.h"
-#include "player-status.h"
+#include "player/player-status.h"
 #include "monster-spell.h"
 #include "monster-status.h"
 #include "spell/spells-type.h"
 #include "cmd-basic.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
 #include "spell/spells2.h"

diff --git a/src/mspells4.c b/src/mspells4.c
index 3205564..8b01177 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -13,17 +13,17 @@
 #include "grid.h"
 #include "spells-summon.h"
 #include "artifact.h"
-#include "player-status.h"
-#include "player-class.h"
-#include "player-personality.h"
-#include "player-damage.h"
+#include "player/player-status.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
+#include "player/player-damage.h"
 #include "realm/realm-hex.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "monster-spell.h"
 #include "monster-status.h"
 #include "spell/spells-type.h"
 #include "melee.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "world/world.h"
 #include "view/display-main-window.h" // 暫定、後で消したい.
 #include "spell/process-effect.h"

diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index dc1745a..90cc05c 100644 (file)
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -4,9 +4,9 @@
 #include "spells-summon.h"
 #include "market/store-util.h"
 #include "market/store-owners.h"
-#include "player-damage.h"
-#include "player-move.h"
-#include "player-effects.h"
+#include "player/player-damage.h"
+#include "player/player-move.h"
+#include "player/player-effects.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "spells-floor.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index 4f10c53..780add4 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -23,11 +23,11 @@
 #include "selfinfo.h"
 #include "spells-summon.h"
 #include "avatar.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-personality.h"
-#include "player-class.h"
-#include "player-damage.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-personality.h"
+#include "player/player-class.h"
+#include "player/player-damage.h"
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "object/object-hook.h"
@@ -35,7 +35,7 @@
 #include "files.h"
 #include "floor/floor.h"
 #include "targeting.h"
-#include "player-race.h"
+#include "player/player-race.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"

diff --git a/src/object/lite-processor.c b/src/object/lite-processor.c
index 8f54aad..6b3972e 100644 (file)
--- a/src/object/lite-processor.c
+++ b/src/object/lite-processor.c
@@ -2,7 +2,7 @@
 #include "object/lite-processor.h"
 #include "object/object-ego.h"
 #include "object/object-hook.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "world/world.h"
 
 /*!

diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c
index cbf3288..3753a94 100644 (file)
--- a/src/object/object-flavor.c
+++ b/src/object/object-flavor.c
@@ -15,8 +15,8 @@
 
 #include "cmd-smith.h"
 #include "artifact.h"
-#include "player-status.h"
-#include "player-class.h"
+#include "player/player-status.h"
+#include "player/player-class.h"
 #include "shoot.h"
 #include "object/object-kind.h"
 #include "object/object-hook.h"

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index e7a7984..3795036 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -5,8 +5,8 @@
 #include "object/object-hook.h"
 #include "monster.h"
 #include "artifact.h"
-#include "player-class.h"
-#include "player-skill.h"
+#include "player/player-class.h"
+#include "player/player-skill.h"
 #include "player/mimic-info-table.h"
 #include "quest.h"
 #include "world/world.h"

diff --git a/src/object/object1.c b/src/object/object1.c
index 9a7c3a3..4aa8f1d 100644 (file)
--- a/src/object/object1.c
+++ b/src/object/object1.c
@@ -23,8 +23,8 @@
 #include "object/object-ego.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "player-move.h"
-#include "player-class.h"
+#include "player/player-move.h"
+#include "player/player-class.h"
 #include "player-inventory.h"
 #include "monster.h"
 #include "files.h"

diff --git a/src/object/object2.c b/src/object/object2.c
index 4f10560..934bf46 100644 (file)
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -35,11 +35,11 @@
 #include "object/object-kind-hook.h"
 #include "artifact.h"
 #include "feature.h"
-#include "player-status.h"
-#include "player-move.h"
-#include "player-effects.h"
-#include "player-class.h"
-#include "player-personality.h"
+#include "player/player-status.h"
+#include "player/player-move.h"
+#include "player/player-effects.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
 #include "monster.h"
 #include "monsterrace-hook.h"
 #include "object/object-ego.h"

diff --git a/src/patron.c b/src/patron.c
index d55e7d8..afa8449 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -12,11 +12,11 @@
 #include "object/object-kind-hook.h"
 #include "mutation/mutation.h"
 #include "artifact.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-race.h"
-#include "player-class.h"
-#include "player-damage.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-race.h"
+#include "player/player-class.h"
+#include "player/player-damage.h"
 
 #include "spell/spells-type.h"
 #include "spells-summon.h"

diff --git a/src/player-inventory.c b/src/player-inventory.c
index c9e8fbd..d2691a0 100644 (file)
--- a/src/player-inventory.c
+++ b/src/player-inventory.c
@@ -9,7 +9,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "floor/floor.h"
-#include "player-move.h"
+#include "player/player-move.h"
 
 #include "view/display-main-window.h"
 

diff --git a/src/player/digestion-processor.c b/src/player/digestion-processor.c
index 336ccde..8d258b0 100644 (file)
--- a/src/player/digestion-processor.c
+++ b/src/player/digestion-processor.c
@@ -2,10 +2,10 @@
 #include "player/digestion-processor.h"
 #include "world/world.h"
 #include "realm/realm-song.h"
-#include "player-damage.h"
-#include "player-effects.h"
+#include "player/player-damage.h"
+#include "player/player-effects.h"
 #include "creature.h"
-#include "player-move.h"
+#include "player/player-move.h"
 
 /*!
  * @brief 10ゲームターンが進行するごとにプレイヤーの腹を減らす

diff --git a/src/player/permanent-resistances.c b/src/player/permanent-resistances.c
index 7f236ad..dcdc152 100644 (file)
--- a/src/player/permanent-resistances.c
+++ b/src/player/permanent-resistances.c
@@ -1,5 +1,5 @@
 #include "permanent-resistances.h"
-#include "player-personality.h"
+#include "player/player-personality.h"
 
 
 /*!

diff --git a/src/player-class.c b/src/player/player-class.c
similarity index 99%
rename from src/player-class.c
rename to src/player/player-class.c
index 6b7c8d3..c5d7f19 100644 (file)
--- a/src/player-class.c
+++ b/src/player/player-class.c
@@ -1,6 +1,6 @@
 
 #include "angband.h"
-#include "player-class.h"
+#include "player/player-class.h"
 
 /*
  * The magic info

diff --git a/src/player-class.h b/src/player/player-class.h
similarity index 99%
rename from src/player-class.h
rename to src/player/player-class.h
index 3134976..98cf290 100644 (file)
--- a/src/player-class.h
+++ b/src/player/player-class.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "spell/spells1.h"
 #include "spell/technic-info-table.h"
-#include "player-status.h"
+#include "player/player-status.h"
 
 /*
  * 職業ごとの選択可能な魔法領域現在の所 bitrh.c でのみ使用。

diff --git a/src/player-damage.c b/src/player/player-damage.c
similarity index 98%
rename from src/player-damage.c
rename to src/player/player-damage.c
index 12da13f..3b1ec6f 100644 (file)
--- a/src/player-damage.c
+++ b/src/player/player-damage.c
@@ -17,13 +17,13 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-broken.h"
-#include "player-move.h"
-#include "player-damage.h"
-#include "player-personality.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-class.h"
-#include "player-race.h"
+#include "player/player-move.h"
+#include "player/player-damage.h"
+#include "player/player-personality.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-class.h"
+#include "player/player-race.h"
 #include "monster-spell.h"
 #include "world/world.h"
 #include "view/display-main-window.h"

diff --git a/src/player-damage.h b/src/player/player-damage.h
similarity index 100%
rename from src/player-damage.h
rename to src/player/player-damage.h

diff --git a/src/player-effects.c b/src/player/player-effects.c
similarity index 99%
rename from src/player-effects.c
rename to src/player/player-effects.c
index 0ae2e52..0168dc4 100644 (file)
--- a/src/player-effects.c
+++ b/src/player/player-effects.c
@@ -35,15 +35,15 @@
 #include "object/object-hook.h"
 #include "wild.h"
 #include "spells-floor.h"
-#include "player-status.h"
-#include "player-class.h"
-#include "player-move.h"
-#include "player-effects.h"
+#include "player/player-status.h"
+#include "player/player-class.h"
+#include "player/player-move.h"
+#include "player/player-effects.h"
 #include "player/race-info-table.h"
-#include "player-class.h"
-#include "player-personality.h"
-#include "player-sex.h"
-#include "player-damage.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
+#include "player/player-sex.h"
+#include "player/player-damage.h"
 #include "monster-status.h"
 #include "snipe.h"
 #include "files.h"

diff --git a/src/player-effects.h b/src/player/player-effects.h
similarity index 100%
rename from src/player-effects.h
rename to src/player/player-effects.h

diff --git a/src/player-move.c b/src/player/player-move.c
similarity index 99%
rename from src/player-move.c
rename to src/player/player-move.c
index 7a859f9..a9e7a92 100644 (file)
--- a/src/player-move.c
+++ b/src/player/player-move.c
@@ -154,13 +154,13 @@
 #include "trap.h"
 #include "quest.h"
 #include "artifact.h"
-#include "player-move.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-race.h"
-#include "player-class.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-race.h"
+#include "player/player-class.h"
 #include "player-inventory.h"
-#include "player-personality.h"
+#include "player/player-personality.h"
 #include "spells-floor.h"
 #include "feature.h"
 #include "warning.h"

diff --git a/src/player-move.h b/src/player/player-move.h
similarity index 100%
rename from src/player-move.h
rename to src/player/player-move.h

diff --git a/src/player-personality.c b/src/player/player-personality.c
similarity index 98%
rename from src/player-personality.c
rename to src/player/player-personality.c
index 3c4e7e8..7274859 100644 (file)
--- a/src/player-personality.c
+++ b/src/player/player-personality.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "player-personality.h"
+#include "player/player-personality.h"
 
 
 /*!

diff --git a/src/player-personality.h b/src/player/player-personality.h
similarity index 100%
rename from src/player-personality.h
rename to src/player/player-personality.h

diff --git a/src/player-race.c b/src/player/player-race.c
similarity index 98%
rename from src/player-race.c
rename to src/player/player-race.c
index e2e2375..80db024 100644 (file)
--- a/src/player-race.c
+++ b/src/player/player-race.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "player-race.h"
+#include "player/player-race.h"
 
 const player_race *rp_ptr;
 

diff --git a/src/player-race.h b/src/player/player-race.h
similarity index 100%
rename from src/player-race.h
rename to src/player/player-race.h

diff --git a/src/player-sex.c b/src/player/player-sex.c
similarity index 93%
rename from src/player-sex.c
rename to src/player/player-sex.c
index 6e6ca73..6de9355 100644 (file)
--- a/src/player-sex.c
+++ b/src/player/player-sex.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "player-sex.h"
+#include "player/player-sex.h"
 
 /*
  * Pointer to the player tables

diff --git a/src/player-sex.h b/src/player/player-sex.h
similarity index 100%
rename from src/player-sex.h
rename to src/player/player-sex.h

diff --git a/src/player-skill.c b/src/player/player-skill.c
similarity index 91%
rename from src/player-skill.c
rename to src/player/player-skill.c
index 3f03b45..d95d6bf 100644 (file)
--- a/src/player-skill.c
+++ b/src/player/player-skill.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "player-skill.h"
+#include "player/player-skill.h"
 
 /*
  * The skill table

diff --git a/src/player-skill.h b/src/player/player-skill.h
similarity index 100%
rename from src/player-skill.h
rename to src/player/player-skill.h

diff --git a/src/player-status.c b/src/player/player-status.c
similarity index 99%
rename from src/player-status.c
rename to src/player/player-status.c
index 18a4fba..faf96b3 100644 (file)
--- a/src/player-status.c
+++ b/src/player/player-status.c
@@ -5,15 +5,15 @@
 
 #include "market/building.h"
 #include "quest.h"
-#include "player-move.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-skill.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-skill.h"
 #include "player/race-info-table.h"
 #include "player/mimic-info-table.h"
-#include "player-class.h"
-#include "player-personality.h"
-#include "player-damage.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
+#include "player/player-damage.h"
 #include "floor/floor.h"
 #include "floor/floor-events.h"
 #include "feature.h"

diff --git a/src/player-status.h b/src/player/player-status.h
similarity index 100%
rename from src/player-status.h
rename to src/player/player-status.h

diff --git a/src/player/process-name.c b/src/player/process-name.c
index 4d17577..12b1d18 100644 (file)
--- a/src/player/process-name.c
+++ b/src/player/process-name.c
@@ -1,6 +1,6 @@
 #include "player/process-name.h"
 #include "autopick/autopick-reader-writer.h"
-#include "player-personality.h"
+#include "player/player-personality.h"
 #include "files.h"
 #include "world/world.h"
 #include "gameterm.h"

diff --git a/src/quest.c b/src/quest.c
index 91dfed5..7f251d4 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -11,8 +11,8 @@
 #include "quest.h"
 #include "monsterrace-hook.h"
 #include "monster.h"
-#include "player-status.h"
-#include "player-personality.h"
+#include "player/player-status.h"
+#include "player/player-personality.h"
 #include "artifact.h"
 #include "feature.h"
 #include "world/world.h"

diff --git a/src/racial.c b/src/racial.c
index 57cd7f6..1a0e342 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -23,10 +23,10 @@
 #include "object/object-hook.h"
 
 #include "mutation/mutation.h"
-#include "player-race.h"
-#include "player-effects.h"
-#include "player-status.h"
-#include "player-damage.h"
+#include "player/player-race.h"
+#include "player/player-effects.h"
+#include "player/player-status.h"
+#include "player/player-damage.h"
 #include "spells-status.h"
 #include "spells-object.h"
 #include "spells-floor.h"
@@ -34,7 +34,7 @@
 #include "realm/realm-hex.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
-#include "player-class.h"
+#include "player/player-class.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells-type.h"
 #include "spell/spells2.h"

diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c
index bd78741..1cdd7c4 100644 (file)
--- a/src/realm/realm-arcane.c
+++ b/src/realm/realm-arcane.c
@@ -11,8 +11,8 @@
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "spells-diceroll.h"
-#include "player-status.h"
-#include "player-effects.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
 #include "targeting.h"
 #include "realm/realm-arcane.h"
 #include "spell/spells-type.h"

diff --git a/src/realm/realm-chaos.c b/src/realm/realm-chaos.c
index 50e39a2..9d103ae 100644 (file)
--- a/src/realm/realm-chaos.c
+++ b/src/realm/realm-chaos.c
@@ -2,8 +2,8 @@
 #include "util.h"
 
 #include "cmd-spell.h"
-#include "player-class.h"
-#include "player-effects.h"
+#include "player/player-class.h"
+#include "player/player-effects.h"
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "spells-floor.h"

diff --git a/src/realm/realm-craft.c b/src/realm/realm-craft.c
index 324ec51..d4b7adc 100644 (file)
--- a/src/realm/realm-craft.c
+++ b/src/realm/realm-craft.c
@@ -8,8 +8,8 @@
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "mutation/mutation.h"
-#include "player-status.h"
-#include "player-effects.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
 #include "realm/realm-craft.h"
 #include "spell/spells3.h"
 

diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c
index 6a70911..39c899a 100644 (file)
--- a/src/realm/realm-crusade.c
+++ b/src/realm/realm-crusade.c
@@ -10,8 +10,8 @@
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "spells-diceroll.h"
-#include "player-class.h"
-#include "player-effects.h"
+#include "player/player-class.h"
+#include "player/player-effects.h"
 #include "targeting.h"
 #include "realm/realm-crusade.h"
 #include "spell/process-effect.h"

diff --git a/src/realm/realm-daemon.c b/src/realm/realm-daemon.c
index 34326f9..b6e4c88 100644 (file)
--- a/src/realm/realm-daemon.c
+++ b/src/realm/realm-daemon.c
@@ -1,7 +1,7 @@
 #include "angband.h"
 #include "util.h"
 
-#include "player-class.h"
+#include "player/player-class.h"
 #include "cmd-spell.h"
 #include "spell/spells-type.h"
 #include "spells-summon.h"
@@ -9,9 +9,9 @@
 #include "spells-status.h"
 #include "spells-object.h"
 #include "spells-diceroll.h"
-#include "player-effects.h"
-#include "player-race.h"
-#include "player-damage.h"
+#include "player/player-effects.h"
+#include "player/player-race.h"
+#include "player/player-damage.h"
 #include "targeting.h"
 #include "realm/realm-daemon.h"
 #include "spell/spells2.h"

diff --git a/src/realm/realm-death.c b/src/realm/realm-death.c
index 640cac5..da2d763 100644 (file)
--- a/src/realm/realm-death.c
+++ b/src/realm/realm-death.c
@@ -6,12 +6,12 @@
 #include "spells-object.h"
 #include "spells-diceroll.h"
 #include "avatar.h"
-#include "player-status.h"
-#include "player-effects.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
 #include "targeting.h"
-#include "player-class.h"
-#include "player-damage.h"
-#include "player-race.h"
+#include "player/player-class.h"
+#include "player/player-damage.h"
+#include "player/player-race.h"
 #include "realm/realm-death.h"
 #include "spell/process-effect.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index bb0b0e0..92a0f2e 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -26,9 +26,9 @@
 #include "object/object-curse.h"
 #include "spells-status.h"
 #include "spell/technic-info-table.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-skill.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-skill.h"
 #include "player-inventory.h"
 #include "realm/realm-hex.h"
 #include "grid.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 0cc3158..35db538 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -10,10 +10,10 @@
 #include "monsterrace-hook.h"
 #include "artifact.h"
 #include "monster.h"
-#include "player-move.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-damage.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-damage.h"
 #include "feature.h"
 #include "spell/technic-info-table.h"
 #include "grid.h"

diff --git a/src/realm/realm-life.c b/src/realm/realm-life.c
index a65a349..8525bc4 100644 (file)
--- a/src/realm/realm-life.c
+++ b/src/realm/realm-life.c
@@ -4,8 +4,8 @@
 #include "spells-floor.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
-#include "player-status.h"
-#include "player-effects.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
 #include "floor/floor.h"
 #include "targeting.h"
 #include "realm/realm-life.h"

diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index 2b287ca..5bd461a 100644 (file)
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -8,9 +8,9 @@
 #include "spells-diceroll.h"
 #include "avatar.h"
 #include "spells-floor.h"
-#include "player-race.h"
-#include "player-effects.h"
-#include "player-damage.h"
+#include "player/player-race.h"
+#include "player/player-effects.h"
+#include "player/player-damage.h"
 #include "targeting.h"
 #include "effect/spells-effect-util.h"
 #include "realm/realm-nature.h"

diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c
index 69f780e..8aae046 100644 (file)
--- a/src/realm/realm-song.c
+++ b/src/realm/realm-song.c
@@ -5,8 +5,8 @@
 #include "spell/spells-type.h"
 #include "spells-status.h"
 #include "spells-floor.h"
-#include "player-class.h"
-#include "player-effects.h"
+#include "player/player-class.h"
+#include "player/player-effects.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
 #include "realm/realm-song.h"

diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c
index bdc3c80..159a9fa 100644 (file)
--- a/src/realm/realm-sorcery.c
+++ b/src/realm/realm-sorcery.c
@@ -8,7 +8,7 @@
 #include "spell/spells-type.h"
 #include "spells-status.h"
 #include "spells-floor.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "targeting.h"
 #include "realm/realm-sorcery.h"
 #include "spell/spells2.h"

diff --git a/src/realm/realm-trump.c b/src/realm/realm-trump.c
index 137d63a..506cd6e 100644 (file)
--- a/src/realm/realm-trump.c
+++ b/src/realm/realm-trump.c
@@ -6,8 +6,8 @@
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "spells-object.h"
-#include "player-effects.h"
-#include "player-class.h"
+#include "player/player-effects.h"
+#include "player/player-class.h"
 #include "targeting.h"
 #include "effect/spells-effect-util.h"
 #include "realm/realm-trump.h"

diff --git a/src/report.c b/src/report.c
index 516a6aa..3d45493 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -12,7 +12,7 @@
 #include "inet.h"
 #include "dungeon/dungeon.h"
 
-#include "player-personality.h"
+#include "player/player-personality.h"
 #include "character-dump.h"
 #include "world/world.h"
 #include "gameterm.h"

diff --git a/src/scores.c b/src/scores.c
index 17ed49b..4f47494 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -19,10 +19,10 @@
 
 #include "dungeon/dungeon.h"
 #include "player/race-info-table.h"
-#include "player-status.h"
-#include "player-class.h"
-#include "player-personality.h"
-#include "player-sex.h"
+#include "player/player-status.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
+#include "player/player-sex.h"
 #include "io/uid-checker.h"
 #include "files.h"
 #include "scores.h"

diff --git a/src/selfinfo.c b/src/selfinfo.c
index 13c8389..37f8770 100644 (file)
--- a/src/selfinfo.c
+++ b/src/selfinfo.c
@@ -17,9 +17,9 @@
 #include "angband.h"
 #include "util.h"
 
-#include "player-status.h"
-#include "player-race.h"
-#include "player-class.h"
+#include "player/player-status.h"
+#include "player/player-race.h"
+#include "player/player-class.h"
 #include "avatar.h"
 #include "realm/realm.h"
 #include "realm/realm-hex.h"

diff --git a/src/snipe.c b/src/snipe.c
index 972d459..e0fdcc0 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -12,7 +12,7 @@
 #include "main/sound-definitions-table.h"
 #include "gameterm.h"
 
-#include "player-status.h"
+#include "player/player-status.h"
 #include "cmd-basic.h"
 #include "snipe.h"
 #include "monsterrace.h"

diff --git a/src/spell/music-checker.c b/src/spell/music-checker.c
index b70011c..9453e8b 100644 (file)
--- a/src/spell/music-checker.c
+++ b/src/spell/music-checker.c
@@ -2,7 +2,7 @@
 #include "spell/music-checker.h"
 #include "realm/realm-song.h"
 #include "spell/spells3.h"
-#include "player-skill.h"
+#include "player/player-skill.h"
 #include "spell/spells-execution.h"
 
 /*!

diff --git a/src/spell/spells1.c b/src/spell/spells1.c
index ef20cb5..5258032 100644 (file)
--- a/src/spell/spells1.c
+++ b/src/spell/spells1.c
@@ -17,7 +17,7 @@
 #include "main/sound-definitions-table.h"
 #include "cmd/cmd-pet.h"
 #include "cmd/cmd-dump.h"
-#include "player-class.h"
+#include "player/player-class.h"
 #include "monster.h"
 #include "spell/spells1.h"
 #include "gameterm.h"

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 66e1fb3..110b403 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -44,12 +44,12 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "monster-status.h"
-#include "player-move.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-skill.h"
-#include "player-class.h"
-#include "player-damage.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-skill.h"
+#include "player/player-class.h"
+#include "player/player-damage.h"
 #include "player-inventory.h"
 
 #include "dungeon/dungeon.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 34af41f..6370c7e 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -28,10 +28,10 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "melee.h"
-#include "player-move.h"
-#include "player-status.h"
-#include "player-class.h"
-#include "player-damage.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
+#include "player/player-class.h"
+#include "player/player-damage.h"
 #include "player-inventory.h"
 #include "spells-summon.h"
 #include "quest.h"
@@ -53,9 +53,9 @@
 #include "snipe.h"
 #include "floor/floor-save.h"
 #include "files.h"
-#include "player-effects.h"
-#include "player-skill.h"
-#include "player-personality.h"
+#include "player/player-effects.h"
+#include "player/player-skill.h"
+#include "player/player-personality.h"
 #include "view/display-main-window.h"
 #include "mind.h"
 #include "wild.h"

diff --git a/src/spells-diceroll.c b/src/spells-diceroll.c
index 6bb7c29..c3de44f 100644 (file)
--- a/src/spells-diceroll.c
+++ b/src/spells-diceroll.c
@@ -4,7 +4,7 @@
 
 #include "monster.h"
 #include "monsterrace-hook.h"
-#include "player-class.h"
+#include "player/player-class.h"
 #include "mutation/mutation.h"
 #include "room/rooms.h"
 

diff --git a/src/spells-floor.c b/src/spells-floor.c
index 2b9b2c6..ef08c9a 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -16,9 +16,9 @@
 
 #include "floor/floor-events.h"
 #include "floor/floor-save.h"
-#include "player-damage.h"
-#include "player-effects.h"
-#include "player-move.h"
+#include "player/player-damage.h"
+#include "player/player-effects.h"
+#include "player/player-move.h"
 #include "feature.h"
 #include "view/display-main-window.h"
 

diff --git a/src/spells-object.c b/src/spells-object.c
index 68dbaf3..11ecc9e 100644 (file)
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -12,11 +12,11 @@
 #include "object/object-hook.h"
 #include "object/object-flavor.h"
 #include "object/object-ego.h"
-#include "player-damage.h"
-#include "player-status.h"
+#include "player/player-damage.h"
+#include "player/player-status.h"
 #include "avatar.h"
-#include "player-effects.h"
-#include "player-class.h"
+#include "player/player-effects.h"
+#include "player/player-class.h"
 #include "player-inventory.h"
 #include "object/object-kind.h"
 #include "autopick/autopick.h"

diff --git a/src/spells-status.c b/src/spells-status.c
index b619979..28352a2 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -6,13 +6,13 @@
 #include "avatar.h"
 #include "effect/effect-characteristics.h"
 #include "object/object-flavor.h"
-#include "player-status.h"
-#include "player-class.h"
+#include "player/player-status.h"
+#include "player/player-class.h"
 #include "spells-status.h"
 #include "spell/spells-type.h"
 #include "monster.h"
 #include "cmd-spell.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "object/object-kind.h"
 #include "targeting.h"
 #include "realm/realm-song.h"

diff --git a/src/targeting.c b/src/targeting.c
index d518e8b..8a159c0 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -32,8 +32,8 @@
 #include "floor/floor-events.h"
 #include "floor/floor-town.h"
 #include "player-inventory.h"
-#include "player-move.h"
-#include "player-status.h"
+#include "player/player-move.h"
+#include "player/player-status.h"
 #include "monster-status.h"
 #include "view/display-main-window.h"
 #include "feature.h"

diff --git a/src/trap.c b/src/trap.c
index e63c42c..ce11569 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -6,16 +6,16 @@
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-save.h"
 #include "trap.h"
-#include "player-damage.h"
-#include "player-move.h"
-#include "player-effects.h"
-#include "player-class.h"
-#include "player-personality.h"
+#include "player/player-damage.h"
+#include "player/player-move.h"
+#include "player/player-effects.h"
+#include "player/player-class.h"
+#include "player/player-personality.h"
 #include "spells-summon.h"
 #include "quest.h"
 #include "artifact.h"
 #include "feature.h"
-#include "player-status.h"
+#include "player/player-status.h"
 #include "grid.h"
 #include "spell/spells-type.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/util.c b/src/util.c
index d74068d..9ecd96d 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -26,7 +26,7 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "japanese.h"
-#include "player-class.h"
+#include "player/player-class.h"
 #include "core/output-updater.h"
 #include "io/input-key-processor.h"
 

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index b9491db..bc19f2e 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -26,11 +26,11 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "view/display-player.h"
-#include "player-status.h"
-#include "player-class.h"
-#include "player-race.h"
+#include "player/player-status.h"
+#include "player/player-class.h"
+#include "player/player-race.h"
 #include "player/mimic-info-table.h"
-#include "player-effects.h"
+#include "player/player-effects.h"
 #include "player-inventory.h"
 #include "monster.h"
 #include "view/display-main-window.h"

diff --git a/src/view/display-player-middle.c b/src/view/display-player-middle.c
index cc29cf4..05186b5 100644 (file)
--- a/src/view/display-player-middle.c
+++ b/src/view/display-player-middle.c
@@ -1,8 +1,8 @@
 #include "view/display-player-middle.h"
 #include "view/status-first-page.h"
 #include "view/display-util.h"
-#include "player-effects.h"
-#include "player-skill.h"
+#include "player/player-effects.h"
+#include "player/player-skill.h"
 #include "realm/realm-song.h"
 #include "world/world.h"
 #include "object/object-kind.h"

diff --git a/src/view/display-player-misc-info.c b/src/view/display-player-misc-info.c
index 2ca3c19..1a3ffe6 100644 (file)
--- a/src/view/display-player-misc-info.c
+++ b/src/view/display-player-misc-info.c
@@ -1,8 +1,8 @@
 #include "angband.h"
 #include "view/display-player-stat-info.h"
 #include "player/mimic-info-table.h"
-#include "player-personality.h"
-#include "player-sex.h"
+#include "player/player-personality.h"
+#include "player/player-sex.h"
 #include "gameterm.h"
 
 /*!

diff --git a/src/view/display-player-stat-info.c b/src/view/display-player-stat-info.c
index 3d99d22..8b229de 100644 (file)
--- a/src/view/display-player-stat-info.c
+++ b/src/view/display-player-stat-info.c
@@ -10,7 +10,7 @@
 #include "display-player-stat-info.h"
 #include "player/mimic-info-table.h"
 #include "gameterm.h"
-#include "player-personality.h"
+#include "player/player-personality.h"
 #include "player/permanent-resistances.h"
 
 /*!

diff --git a/src/view/display-player.c b/src/view/display-player.c
index 9db9e84..91e2998 100644 (file)
--- a/src/view/display-player.c
+++ b/src/view/display-player.c
@@ -8,10 +8,10 @@
 
 #include "display-player.h"
 #include "player/mimic-info-table.h"
-#include "player-personality.h"
+#include "player/player-personality.h"
 #include "gameterm.h"
 #include "status-first-page.h"
-#include "player-sex.h"
+#include "player/player-sex.h"
 #include "patron.h"
 #include "world/world.h"
 #include "quest.h"

diff --git a/src/warning.c b/src/warning.c
index fd2133b..1cf605c 100644 (file)
--- a/src/warning.c
+++ b/src/warning.c
@@ -3,18 +3,18 @@
 #include "util.h"
 
 #include "artifact.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "feature.h"
 #include "floor/floor.h"
 #include "warning.h"
-#include "player-status.h"
+#include "player/player-status.h"
 #include "monster.h"
 #include "monster-spell.h"
 #include "spell/spells-type.h"
 #include "object/object-flavor.h"
 #include "dungeon/dungeon.h"
 #include "player/mimic-info-table.h"
-#include "player-class.h"
+#include "player/player-class.h"
 #include "melee.h"
 
 /*!

diff --git a/src/wild.c b/src/wild.c
index 8e69206..cc116c2 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -20,8 +20,8 @@
 #include "world/world.h"
 #include "monster.h"
 #include "realm/realm-hex.h"
-#include "player-status.h"
-#include "player-effects.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
 #include "grid.h"
 #include "monster-status.h"
 #include "quest.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index 481c2ad..f284c19 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -30,10 +30,10 @@
 #include "mutation/mutation.h"
 #include "quest.h"
 #include "artifact.h"
-#include "player-status.h"
-#include "player-effects.h"
-#include "player-skill.h"
-#include "player-class.h"
+#include "player/player-status.h"
+#include "player/player-effects.h"
+#include "player/player-skill.h"
+#include "player/player-class.h"
 #include "player-inventory.h"
 
 #include "spell/spells-util.h"

diff --git a/src/world/world-movement-processor.c b/src/world/world-movement-processor.c
index 1c3ffc0..2fd73ca 100644 (file)
--- a/src/world/world-movement-processor.c
+++ b/src/world/world-movement-processor.c
@@ -6,7 +6,7 @@
 #include "quest.h"
 #include "world/world.h"
 #include "cmd/cmd-save.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "view/display-main-window.h"
 
 /*!

diff --git a/src/world/world-turn-processor.c b/src/world/world-turn-processor.c
index d8800c2..6aaf600 100644 (file)
--- a/src/world/world-turn-processor.c
+++ b/src/world/world-turn-processor.c
@@ -9,7 +9,7 @@
 #include "core/hp-mp-regenerator.h"
 #include "cmd/cmd-save.h"
 #include "monster-status.h"
-#include "player-move.h"
+#include "player/player-move.h"
 #include "wild.h"
 #include "player/digestion-processor.h"
 #include "core/hp-mp-processor.h"

diff --git a/src/world/world.c b/src/world/world.c
index 233a085..1ee5edb 100644 (file)
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -1,6 +1,6 @@
 #include "angband.h"
 #include "world/world.h"
-#include "player-race.h"
+#include "player/player-race.h"
 
 world_type world;
 world_type *current_world_ptr = &world;