[Refactor] #38862 Moved files.c/h to io/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index e4c9ba6..f619c57 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -444,7 +444,7 @@
     <ClInclude Include="..\..\src\object\chest.h" />\r
     <ClInclude Include="..\..\src\chuukei.h" />\r
     <ClCompile Include="..\..\src\player\player-move.c" />\r
-    <ClCompile Include="..\..\src\files.c" />\r
+    <ClCompile Include="..\..\src\io\files.c" />\r
     <ClCompile Include="..\..\src\grid\grid.c" />\r
     <ClCompile Include="..\..\src\inet.c" />\r
     <ClCompile Include="..\..\src\locale\japanese.c" />\r
@@ -630,7 +630,7 @@
     <ClInclude Include="..\..\src\dungeon\dungeon-file.h" />\r
     <ClInclude Include="..\..\src\dungeon\dungeon.h" />\r
     <ClInclude Include="..\..\src\grid\feature.h" />\r
-    <ClInclude Include="..\..\src\files.h" />\r
+    <ClInclude Include="..\..\src\io\files.h" />\r
     <ClInclude Include="..\..\src\floor\floor-events.h" />\r
     <ClInclude Include="..\..\src\floor\floor-generate.h" />\r
     <ClInclude Include="..\..\src\floor\floor-save.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 55d8f3d..20315ce 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -10,9 +10,6 @@
       <Filter>player</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\init.c" />
-    <ClCompile Include="..\..\src\files.c">
-      <Filter>io</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\chuukei.c">
       <Filter>io</Filter>
     </ClCompile>
@@ -829,6 +826,9 @@
     <ClCompile Include="..\..\src\inventory\player-inventory.c">
       <Filter>inventory</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\io\files.c">
+      <Filter>io</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -840,9 +840,6 @@
     <ClInclude Include="..\..\src\patron.h">
       <Filter>player</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\files.h">
-      <Filter>io</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\chuukei.h">
       <Filter>io</Filter>
     </ClInclude>
@@ -1701,6 +1698,9 @@
     <ClInclude Include="..\..\src\inventory\player-inventory.h">
       <Filter>inventory</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\io\files.h">
+      <Filter>io</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index a4f1f4c..468a10a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,6 +71,7 @@ hengband_SOURCES = \
        \
        io/character-dump.c io/character-dump.h \
        io/dump-remover.c io/dump-remover.h \
+       io/files.c io/files.h \
        io/gf-descriptions.c io/gf-descriptions.h \
        io/tokenizer.c io/tokenizer.h \
        io/interpret-pref-file.c io/interpret-pref-file.h \
@@ -84,7 +85,6 @@ hengband_SOURCES = \
        io/uid-checker.c io/uid-checker.h \
        io/input-key-processor.c io/input-key-processor.h \
        \
-       files.c files.h \
        core/game-play.c core/game-play.h \
        core/show-file.c core/show-file.h \
        core/stuff-handler.c core/stuff-handler.h \

diff --git a/src/autopick/autopick-drawer.c b/src/autopick/autopick-drawer.c
index 9b69a40..1e68218 100644 (file)
--- a/src/autopick/autopick-drawer.c
+++ b/src/autopick/autopick-drawer.c
@@ -10,7 +10,7 @@
 #include "autopick/autopick-describer.h"
 #include "autopick/autopick-entry.h"
 #include "gameterm.h"
-#include "files.h"
+#include "io/files.h"
 
 #define DESCRIPT_HGT 3
 

diff --git a/src/autopick/autopick-reader-writer.c b/src/autopick/autopick-reader-writer.c
index f55f1ef..e075e39 100644 (file)
--- a/src/autopick/autopick-reader-writer.c
+++ b/src/autopick/autopick-reader-writer.c
@@ -2,7 +2,7 @@
 #include "autopick/autopick-reader-writer.h"
 #include "autopick/autopick-initializer.h"
 #include "autopick/autopick-pref-processor.h"
-#include "files.h"
+#include "io/files.h"
 #include "io/read-pref-file.h"
 
 /*

diff --git a/src/autopick/autopick-registry.c b/src/autopick/autopick-registry.c
index 82b932d..1d842c9 100644 (file)
--- a/src/autopick/autopick-registry.c
+++ b/src/autopick/autopick-registry.c
@@ -15,7 +15,7 @@
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
 #include "util.h"
-#include "files.h"
+#include "io/files.h"
 
 static const char autoregister_header[] = "?:$AUTOREGISTER";
 

diff --git a/src/chuukei.c b/src/chuukei.c
index 1ad7af9..473c78e 100644 (file)
--- a/src/chuukei.c
+++ b/src/chuukei.c
@@ -9,7 +9,7 @@
 #include "system/angband.h"
 
 #include "io/signal-handlers.h"
-#include "files.h"
+#include "io/files.h"
 #include "util.h"
 #include "gameterm.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index 35824a9..bb31bfe 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -25,7 +25,7 @@
 #include "player/player-damage.h"
 #include "inventory/player-inventory.h"
 #include "monster/monster-status.h"
-#include "files.h"
+#include "io/files.h"
 #include "object/object-kind.h"
 #include "object/object-ego.h"
 #include "targeting.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 215b9ca..43ef719 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -46,7 +46,7 @@
 
 #include "cmd-basic.h"
 #include "dungeon/dungeon-file.h"
-#include "files.h"
+#include "io/files.h"
 
 #include "view/display-main-window.h"
 #include "targeting.h"

diff --git a/src/cmd/cmd-diary.c b/src/cmd/cmd-diary.c
index ef5f5ad..a1fd351 100644 (file)
--- a/src/cmd/cmd-diary.c
+++ b/src/cmd/cmd-diary.c
@@ -2,7 +2,7 @@
 #include "cmd/cmd-diary.h"
 #include "chuukei.h"
 #include "core/show-file.h"
-#include "files.h"
+#include "io/files.h"
 #include "cmd/diary-subtitle-table.h"
 #include "player/player-personality.h"
 #include "io/write-diary.h"

diff --git a/src/cmd/cmd-draw.c b/src/cmd/cmd-draw.c
index 0c8cf28..31036d1 100644 (file)
--- a/src/cmd/cmd-draw.c
+++ b/src/cmd/cmd-draw.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "core/stuff-handler.h"
 #include "cmd/cmd-draw.h"
-#include "files.h"
+#include "io/files.h"
 #include "gameterm.h"
 #include "view/display-main-window.h" // 暫定。後で消す.
 #include "player/player-effects.h"

diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c
index 45a0887..f5d67ed 100644 (file)
--- a/src/cmd/cmd-gameoption.c
+++ b/src/cmd/cmd-gameoption.c
@@ -8,7 +8,7 @@
 #include "view/display-main-window.h"
 #include "cmd/cmd-dump.h"
 #include "core/show-file.h"
-#include "files.h"
+#include "io/files.h"
 
 #include "world/world.h"
 

diff --git a/src/cmd/cmd-macro.c b/src/cmd/cmd-macro.c
index 866b8a1..5f2c72c 100644 (file)
--- a/src/cmd/cmd-macro.c
+++ b/src/cmd/cmd-macro.c
@@ -1,7 +1,7 @@
 #include "system/angband.h"
 #include "cmd-macro.h"
 #include "cmd-gameoption.h"
-#include "files.h"
+#include "io/files.h"
 #include "io/read-pref-file.h"
 #include "gameterm.h"
 

diff --git a/src/cmd/cmd-process-screen.c b/src/cmd/cmd-process-screen.c
index 05e87b3..8894918 100644 (file)
--- a/src/cmd/cmd-process-screen.c
+++ b/src/cmd/cmd-process-screen.c
@@ -8,7 +8,7 @@
 #include "system/angband.h"
 #include "cmd/cmd-process-screen.h"
 #include "cmd/cmd-draw.h"
-#include "files.h"
+#include "io/files.h"
 #include "gameterm.h"
 #include "core/stuff-handler.h"
 

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index ce48bad..a799dda 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -29,7 +29,7 @@
 
 #include "cmd/cmd-basic.h"
 #include "core/show-file.h"
-#include "files.h"
+#include "io/files.h"
 #include "floor/floor.h"
 #include "object/object-kind.h"
 #include "view/display-main-window.h"

diff --git a/src/cmd/cmd-visuals.c b/src/cmd/cmd-visuals.c
index 48a6837..ddb9509 100644 (file)
--- a/src/cmd/cmd-visuals.c
+++ b/src/cmd/cmd-visuals.c
@@ -4,7 +4,7 @@
 #include "knowledge/knowledge-features.h"
 #include "knowledge/knowledge-items.h"
 #include "knowledge/knowledge-monsters.h"
-#include "files.h"
+#include "io/files.h"
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
 #include "gameterm.h"

diff --git a/src/combat/melee.c b/src/combat/melee.c
index 9d78125..7ada849 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -34,7 +34,7 @@
 #include "dungeon/dungeon.h"
 #include "spell/process-effect.h"
 #include "spell/spells-type.h"
-#include "files.h"
+#include "io/files.h"
 #include "player/player-move.h"
 #include "player/player-effects.h"
 #include "player/player-skill.h"

diff --git a/src/core/show-file.c b/src/core/show-file.c
index 3055710..8c6cc0b 100644 (file)
--- a/src/core/show-file.c
+++ b/src/core/show-file.c
@@ -1,5 +1,5 @@
 #include "core/show-file.h"
-#include "files.h"
+#include "io/files.h"
 #include "core/angband-version.h"
 #include "gameterm.h"
 

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index dcd4b6a..2c32ba4 100644 (file)
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -36,14 +36,14 @@
 #include "system/system-variables.h"
 
 #include "io/tokenizer.h"
-#include "files.h"
+#include "io/files.h"
 #include "dungeon/dungeon-file.h"
 #include "room/rooms-vault.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "quest.h"
 #include "monster/monster.h"
-#include "files.h"
+#include "io/files.h"
 #include "player/player-skill.h"
 #include "player/player-race.h"
 #include "dungeon/dungeon.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 4b8212e..106c3e7 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -34,7 +34,7 @@
 #include "cmd-pet.h"
 #include "cmd-basic.h"
 #include "io/uid-checker.h"
-#include "files.h"
+#include "io/files.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
 #include "player/player-personality.h"

diff --git a/src/grid/trap.c b/src/grid/trap.c
index 711ea5d..8961115 100644 (file)
--- a/src/grid/trap.c
+++ b/src/grid/trap.c
@@ -21,7 +21,7 @@
 #include "effect/effect-characteristics.h"
 #include "floor/floor-save.h"
 #include "init.h"
-#include "files.h"
+#include "io/files.h"
 #include "dungeon/dungeon.h"
 #include "world/world.h"
 #include "spell/process-effect.h"

diff --git a/src/inet.c b/src/inet.c
index 19ddb8b..21d2255 100644 (file)
--- a/src/inet.c
+++ b/src/inet.c
@@ -2,7 +2,7 @@
 
 #include "system/angband.h"
 #include "util.h"
-#include "files.h"
+#include "io/files.h"
 #include "inet.h"
 
 

diff --git a/src/init.c b/src/init.c
index b0e1ef0..569a48c 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -33,7 +33,7 @@
 #include "system/angband.h"
 #include "util.h"
 #include "io/uid-checker.h"
-#include "files.h"
+#include "io/files.h"
 #include "system/system-variables.h"
 #include "core/angband-version.h"
 #include "io/read-pref-file.h"
@@ -48,7 +48,7 @@
 #include "market/store.h"
 #include "wild.h"
 #include "dungeon/dungeon-file.h"
-#include "files.h"
+#include "io/files.h"
 #include "grid/feature.h"
 #include "floor/floor.h"
 #include "floor/floor-town.h"

diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c
index 40bf7fb..484c5e0 100644 (file)
--- a/src/inventory/inventory-curse.c
+++ b/src/inventory/inventory-curse.c
@@ -6,7 +6,7 @@
 #include "player/player-move.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
-#include "files.h"
+#include "io/files.h"
 #include "object/object-curse.h"
 #include "object/artifact.h"
 #include "object/object-hook.h"

diff --git a/src/io/character-dump.h b/src/io/character-dump.h
index 81664d7..0efd0e2 100644 (file)
--- a/src/io/character-dump.h
+++ b/src/io/character-dump.h
@@ -1,6 +1,6 @@
 #pragma once
 
 #include "system/angband.h"
-#include "files.h"
+#include "io/files.h"
 
 void make_character_dump(player_type *creature_ptr, FILE *fff, void(*update_playtime)(void), display_player_pf display_player, map_name_pf map_name);

diff --git a/src/files.c b/src/io/files.c
similarity index 99%
rename from src/files.c
rename to src/io/files.c
index dd46364..73ae51c 100644 (file)
--- a/src/files.c
+++ b/src/io/files.c
@@ -14,7 +14,7 @@
 
 #include "system/angband.h"
 #include "io/uid-checker.h"
-#include "files.h"
+#include "io/files.h"
 #include "system/system-variables.h" // 暫定。後で消す.
 #include "io/character-dump.h"
 

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

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 917773e..718b5f7 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -29,7 +29,7 @@
 #include "knowledge/knowledge-quests.h"
 #include "chuukei.h"
 #include "player/player-move.h" // do_cmd_travel() がある。後で移設する.
-#include "files.h"
+#include "io/files.h"
 
 #include "cmd/cmd-activate.h"
 #include "cmd/cmd-autopick.h"

diff --git a/src/io/load.c b/src/io/load.c
index dbef9ed..c5d9361 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -73,7 +73,7 @@
 #include "cmd-pet.h"
 #include "dungeon/dungeon-file.h"
 #include "io/uid-checker.h"
-#include "files.h"
+#include "io/files.h"
 #include "player/player-skill.h"
 #include "player/player-class.h"
 #include "player/race-info-table.h"

diff --git a/src/io/player-status-dump.c b/src/io/player-status-dump.c
index 12010ae..f4e312f 100644 (file)
--- a/src/io/player-status-dump.c
+++ b/src/io/player-status-dump.c
@@ -1,5 +1,5 @@
 #include "system/angband.h"
-#include "files.h"
+#include "io/files.h"
 #include "io/player-status-dump.h"
 
 

diff --git a/src/io/read-pref-file.c b/src/io/read-pref-file.c
index 851de6b..179c624 100644 (file)
--- a/src/io/read-pref-file.c
+++ b/src/io/read-pref-file.c
@@ -19,7 +19,7 @@
 #include "io/read-pref-file.h"
 #include "io/interpret-pref-file.h"
 #include "autopick/autopick-pref-processor.h"
-#include "files.h" // 暫定。コールバック化して後で消す.
+#include "io/files.h" // 暫定。コールバック化して後で消す.
 #include "world/world.h"
 #include "system/system-variables.h"
 #include "autopick/autopick-reader-writer.h"

diff --git a/src/io/save.c b/src/io/save.c
index a54c699..526fef7 100644 (file)
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -30,7 +30,7 @@
 #include "floor/floor-save.h"
 #include "floor/floor-town.h"
 #include "io/uid-checker.h"
-#include "files.h"
+#include "io/files.h"
 #include "world/world.h"
 #include "object/object-kind.h"
 #include "monster/monsterrace.h"

diff --git a/src/io/write-diary.c b/src/io/write-diary.c
index 37520b6..51f2d9f 100644 (file)
--- a/src/io/write-diary.c
+++ b/src/io/write-diary.c
@@ -7,7 +7,7 @@
 #include "io/write-diary.h"
 #include "system/system-variables.h"
 #include "quest.h"
-#include "files.h"
+#include "io/files.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/dungeon-file.h"
 #include "world/world.h"

diff --git a/src/main-win.c b/src/main-win.c
index c2a3d2d..7de77b5 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -105,10 +105,10 @@
 #include "floor/floor.h"
 #include "floor/floor-events.h"
 #include "init.h"
-#include "files.h"
+#include "io/files.h"
 #include "scores.h"
 #include "quest.h"
-#include "files.h"
+#include "io/files.h"
 #include "system/system-variables.h"
 #include "core/game-play.h"
 #include "core/angband-version.h"

diff --git a/src/market/building.c b/src/market/building.c
index 4bf151f..fc416fc 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -51,7 +51,7 @@
 #include "realm/realm-hex.h"
 #include "dungeon/dungeon-file.h"
 
-#include "files.h"
+#include "io/files.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"

diff --git a/src/market/store.c b/src/market/store.c
index 90a9a62..6374991 100644 (file)
--- a/src/market/store.c
+++ b/src/market/store.c
@@ -50,7 +50,7 @@
 #include "object/object-hook.h"
 #include "floor/floor-events.h"
 #include "snipe.h"
-#include "files.h"
+#include "io/files.h"
 #include "player/player-effects.h"
 #include "player/race-info-table.h"
 #include "mind.h"

diff --git a/src/monster/monster-move.c b/src/monster/monster-move.c
index b92def1..a6d2c8b 100644 (file)
--- a/src/monster/monster-move.c
+++ b/src/monster/monster-move.c
@@ -10,7 +10,7 @@
 #include "monster/monster-update.h"
 #include "cmd/cmd-pet.h"
 #include "creature.h"
-#include "files.h"
+#include "io/files.h"
 #include "monster/monster-status.h"
 #include "player/player-move.h"
 #include "spell/spells-type.h"

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 1c4f2c4..55c9f87 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -21,7 +21,7 @@
 #include "object/object-curse.h"
 #include "object/artifact.h"
 #include "player/avatar.h"
-#include "files.h"
+#include "io/files.h"
 #include "player/player-effects.h"
 #include "player/player-personality.h"
 #include "view/display-main-window.h"

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index 8803ec9..6a7e593 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -36,7 +36,7 @@
 #include "wild.h"
 #include "warning.h"
 #include "spell/monster-spell.h"
-#include "files.h"
+#include "io/files.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 #include "monster/monsterrace.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index 7e753a5..ee15503 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -32,7 +32,7 @@
 #include "spell/spells-floor.h"
 #include "object/object-hook.h"
 #include "cmd-basic.h"
-#include "files.h"
+#include "io/files.h"
 #include "floor/floor.h"
 #include "targeting.h"
 #include "player/player-race.h"

diff --git a/src/object/artifact.c b/src/object/artifact.c
index b2a0209..b00fc00 100644 (file)
--- a/src/object/artifact.c
+++ b/src/object/artifact.c
@@ -27,7 +27,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "spell/spells-object.h"
-#include "files.h"
+#include "io/files.h"
 #include "grid/grid.h"
 #include "monster/monster.h"
 #include "view/display-main-window.h"

diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c
index eec8327..972d543 100644 (file)
--- a/src/object/object-flavor.c
+++ b/src/object/object-flavor.c
@@ -23,7 +23,7 @@
 #include "object/object-flavor.h"
 #include "grid/trap.h"
 #include "snipe.h"
-#include "files.h"
+#include "io/files.h"
 #include "world/world.h"
 #include "monster/monsterrace.h"
 #include "object/object-ego.h"

diff --git a/src/object/object1.c b/src/object/object1.c
index 8f6c5f1..4effbf2 100644 (file)
--- a/src/object/object1.c
+++ b/src/object/object1.c
@@ -27,7 +27,7 @@
 #include "player/player-class.h"
 #include "inventory/player-inventory.h"
 #include "monster/monster.h"
-#include "files.h"
+#include "io/files.h"
 #include "gameterm.h"
 #include "cmd-smith.h"
 #include "snipe.h"

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 1f7a399..ab21220 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -31,7 +31,7 @@
 #include "report.h"
 #include "wild.h"
 #include "io/save.h"
-#include "files.h"
+#include "io/files.h"
 
 /*!
  * @brief アイテムを指定確率で破損させる /

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 991f362..48a590f 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -46,7 +46,7 @@
 #include "player/player-damage.h"
 #include "monster/monster-status.h"
 #include "snipe.h"
-#include "files.h"
+#include "io/files.h"
 #include "spell/monster-spell.h"
 #include "world/world.h"
 #include "object/object-kind.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index edb6fbf..98d7822 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -43,7 +43,7 @@
 #include "melee.h"
 #include "world/world.h"
 #include "view/display-main-window.h"
-#include "files.h"
+#include "io/files.h"
 #include "cmd-magiceat.h"
 
 #include "monster/horror-descriptions.h"

diff --git a/src/player/process-death.h b/src/player/process-death.h
index 612fd1b..25726c1 100644 (file)
--- a/src/player/process-death.h
+++ b/src/player/process-death.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
-#include "files.h"
+#include "io/files.h"
 
 void print_tomb(player_type *dead_ptr);
 void show_death_info(player_type *creature_ptr, update_playtime_pf update_playtime, display_player_pf display_player, map_name_pf map_name);

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

diff --git a/src/report.h b/src/report.h
index e83cce8..348658f 100644 (file)
--- a/src/report.h
+++ b/src/report.h
@@ -3,7 +3,7 @@
 extern concptr screen_dump;
 
 #ifdef WORLD_SCORE
-#include "files.h"
+#include "io/files.h"
 
 extern errr report_score(player_type *creature_ptr, void(*update_playtime)(void), display_player_pf display_player, map_name_pf map_name);
 extern concptr make_screen_dump(player_type *creature_ptr, void(*process_autopick_file_command)(char*));

diff --git a/src/rumor.c b/src/rumor.c
index ff8e3c6..98cb0ea 100644 (file)
--- a/src/rumor.c
+++ b/src/rumor.c
@@ -2,7 +2,7 @@
 #include "util.h"
 
 #include "io/tokenizer.h"
-#include "files.h"
+#include "io/files.h"
 #include "object/object-flavor.h"
 #include "object/artifact.h"
 #include "dungeon/dungeon.h"

diff --git a/src/scores.c b/src/scores.c
index 25a508b..0924a8e 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -24,7 +24,7 @@
 #include "player/player-personality.h"
 #include "player/player-sex.h"
 #include "io/uid-checker.h"
-#include "files.h"
+#include "io/files.h"
 #include "scores.h"
 #include "floor/floor.h"
 #include "world/world.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 141cfdf..5e438a3 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -52,7 +52,7 @@
 #include "cmd/cmd-dump.h"
 #include "snipe.h"
 #include "floor/floor-save.h"
-#include "files.h"
+#include "io/files.h"
 #include "player/player-effects.h"
 #include "player/player-skill.h"
 #include "player/player-personality.h"

diff --git a/src/util.c b/src/util.c
index 3ae76b1..5a613d3 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -17,7 +17,7 @@
 #include "core/stuff-handler.h"
 #include "gameterm.h"
 #include "util.h"
-#include "files.h"
+#include "io/files.h"
 #include "monster/monsterrace-hook.h"
 #include "view/display-main-window.h"
 #include "quest.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 9bfe8df..3bf8437 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -20,7 +20,7 @@
 #include "market/building.h"
 #include "system/system-variables.h"
 #include "core/stuff-handler.h"
-#include "files.h"
+#include "io/files.h"
 #include "world/world.h"
 #include "quest.h"
 #include "object/artifact.h"

diff --git a/src/view/display-player.h b/src/view/display-player.h
index eec23a0..742ecd6 100644 (file)
--- a/src/view/display-player.h
+++ b/src/view/display-player.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
-#include "files.h"
+#include "io/files.h"
 
 void display_player(player_type *creature_ptr, int mode, map_name_pf map_name);
 void display_player_equippy(player_type *player_ptr, TERM_LEN y, TERM_LEN x, BIT_FLAGS16 mode);

diff --git a/src/wild.c b/src/wild.c
index 76dc52f..aefcada 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -27,7 +27,7 @@
 #include "quest.h"
 #include "dungeon/dungeon-file.h"
 #include "io/tokenizer.h"
-#include "files.h"
+#include "io/files.h"
 #include "grid/feature.h"
 #include "floor/floor-town.h"
 #include "realm/realm.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index f4ea15d..8d2604e 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -51,7 +51,7 @@
 #include "floor/floor-save.h"
 #include "grid/grid.h"
 #include "dungeon/dungeon-file.h"
-#include "files.h"
+#include "io/files.h"
 #include "spell/monster-spell.h"
 #include "market/building.h"
 #include "object/object-kind.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index 90500f0..ae16c61 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -26,7 +26,7 @@
 #include "object/object-ego.h"
 #include "object/object-kind.h"
 #include "floor/floor-town.h"
-#include "files.h"
+#include "io/files.h"
 
  /*
   * The spoiler file being created