[Refactor] #39962 Renamed files.c/h to files-util.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index c1a6a84..722c051 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -509,7 +509,7 @@
     <ClInclude Include="..\..\src\object\chest.h" />\r
     <ClInclude Include="..\..\src\io\chuukei.h" />\r
     <ClCompile Include="..\..\src\player\player-move.c" />\r
-    <ClCompile Include="..\..\src\io\files.c" />\r
+    <ClCompile Include="..\..\src\io\files-util.c" />\r
     <ClCompile Include="..\..\src\grid\grid.c" />\r
     <ClCompile Include="..\..\src\io\inet.c" />\r
     <ClCompile Include="..\..\src\locale\japanese.c" />\r
@@ -697,7 +697,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\io\files.h" />\r
+    <ClInclude Include="..\..\src\io\files-util.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 a206ca3..390f3bb 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -737,9 +737,6 @@
     <ClCompile Include="..\..\src\inventory\player-inventory.c">
       <Filter>inventory</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\io\files.c">
-      <Filter>io</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\term\gameterm.c">
       <Filter>term</Filter>
     </ClCompile>
@@ -932,6 +929,9 @@
     <ClCompile Include="..\..\src\birth\character-builder.c">
       <Filter>birth</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\io\files-util.c">
+      <Filter>io</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-activate.h">
@@ -1717,9 +1717,6 @@
     <ClInclude Include="..\..\src\inventory\player-inventory.h">
       <Filter>inventory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\io\files.h">
-      <Filter>io</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\term\gameterm.h">
       <Filter>term</Filter>
     </ClInclude>
@@ -1924,6 +1921,9 @@
     <ClInclude Include="..\..\src\player\player-personalities-table.h">
       <Filter>player</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\io\files-util.h">
+      <Filter>io</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/autopick/autopick-drawer.c b/src/autopick/autopick-drawer.c
index ad556ee..69afa93 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 "term/gameterm.h"
-#include "io/files.h"
+#include "io/files-util.h"
 
 #define DESCRIPT_HGT 3
 

diff --git a/src/autopick/autopick-reader-writer.c b/src/autopick/autopick-reader-writer.c
index e075e39..9059b8a 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 "io/files.h"
+#include "io/files-util.h"
 #include "io/read-pref-file.h"
 
 /*

diff --git a/src/autopick/autopick-registry.c b/src/autopick/autopick-registry.c
index 2548ac9..b080fea 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/util.h"
-#include "io/files.h"
+#include "io/files-util.h"
 
 static const char autoregister_header[] = "?:$AUTOREGISTER";
 

diff --git a/src/birth/history-editor.c b/src/birth/history-editor.c
index a28ceeb..2bcebe6 100644 (file)
--- a/src/birth/history-editor.c
+++ b/src/birth/history-editor.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "birth/history-editor.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "view/display-main-window.h" // 暫定。後で消す.
 #include "term/gameterm.h"
 #include "view/display-player.h" // 暫定。後で消す.

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index b555b44..9a81436 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 "io/files.h"
+#include "io/files-util.h"
 #include "object/object-kind.h"
 #include "object/object-ego.h"
 #include "io/targeting.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 09f4de5..0cc7cb4 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 "io/files.h"
+#include "io/files-util.h"
 
 #include "view/display-main-window.h"
 #include "io/targeting.h"

diff --git a/src/cmd/cmd-diary.c b/src/cmd/cmd-diary.c
index e178a58..780c0ba 100644 (file)
--- a/src/cmd/cmd-diary.c
+++ b/src/cmd/cmd-diary.c
@@ -2,7 +2,7 @@
 #include "cmd/cmd-diary.h"
 #include "io/chuukei.h"
 #include "core/show-file.h"
-#include "io/files.h"
+#include "io/files-util.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 c58b11a..5fa2038 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 "io/files.h"
+#include "io/files-util.h"
 #include "term/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 0922638..047e84a 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 "io/files.h"
+#include "io/files-util.h"
 
 #include "world/world.h"
 

diff --git a/src/cmd/cmd-macro.c b/src/cmd/cmd-macro.c
index ccb25db..d4c68d1 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 "io/files.h"
+#include "io/files-util.h"
 #include "io/read-pref-file.h"
 #include "term/gameterm.h"
 

diff --git a/src/cmd/cmd-process-screen.c b/src/cmd/cmd-process-screen.c
index 47e8c56..7674ba6 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 "io/files.h"
+#include "io/files-util.h"
 #include "term/gameterm.h"
 #include "core/stuff-handler.h"
 

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index 110c150..31b1ae7 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 "io/files.h"
+#include "io/files-util.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 bbbb431..492e357 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 "io/files.h"
+#include "io/files-util.h"
 #include "object/object-kind.h"
 #include "object/object-flavor.h"
 #include "term/gameterm.h"

diff --git a/src/combat/melee.c b/src/combat/melee.c
index 22c411a..b78eaa8 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 "io/files.h"
+#include "io/files-util.h"
 #include "player/player-move.h"
 #include "player/player-effects.h"
 #include "player/player-skill.h"

diff --git a/src/core/scores.c b/src/core/scores.c
index af8a5d6..2ce2b4a 100644 (file)
--- a/src/core/scores.c
+++ b/src/core/scores.c
@@ -24,7 +24,7 @@
 #include "player/player-personality.h"
 #include "player/player-sex.h"
 #include "io/uid-checker.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "core/scores.h"
 #include "floor/floor.h"
 #include "world/world.h"

diff --git a/src/core/show-file.c b/src/core/show-file.c
index 20ea24a..0019de2 100644 (file)
--- a/src/core/show-file.c
+++ b/src/core/show-file.c
@@ -1,5 +1,5 @@
 #include "core/show-file.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "system/angband-version.h"
 #include "term/gameterm.h"
 

diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index 95d276a..586a76c 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 "io/files.h"
+#include "io/files-util.h"
 #include "dungeon/dungeon-file.h"
 #include "room/rooms-vault.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "dungeon/quest.h"
 #include "monster/monster.h"
-#include "io/files.h"
+#include "io/files-util.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 a162a70..17c5cc3 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 "io/files.h"
+#include "io/files-util.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"
 #include "player/player-personalities-table.h"

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

diff --git a/src/grid/trap.c b/src/grid/trap.c
index 85edfed..f4af709 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 "main/init.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "dungeon/dungeon.h"
 #include "world/world.h"
 #include "spell/process-effect.h"

diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c
index 1fa81fc..fd34c8d 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 "io/files.h"
+#include "io/files-util.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 0efd0e2..3457506 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 "io/files.h"
+#include "io/files-util.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/io/chuukei.c b/src/io/chuukei.c
index 6b1d8dd..ba7918d 100644 (file)
--- a/src/io/chuukei.c
+++ b/src/io/chuukei.c
@@ -9,7 +9,7 @@
 #include "system/angband.h"
 
 #include "io/signal-handlers.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "util/util.h"
 #include "term/gameterm.h"
 #include "cmd/cmd-dump.h"

diff --git a/src/io/files.c b/src/io/files-util.c
similarity index 99%
rename from src/io/files.c
rename to src/io/files-util.c
index 73ae51c..8dbd10f 100644 (file)
--- a/src/io/files.c
+++ b/src/io/files-util.c
@@ -1,5 +1,4 @@
 /*!
- * @file files.c
  * @brief ファイル入出力管理 / Purpose: code dealing with files (and death)
  * @date 2014/01/28
  * @author
@@ -14,7 +13,7 @@
 
 #include "system/angband.h"
 #include "io/uid-checker.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "system/system-variables.h" // 暫定。後で消す.
 #include "io/character-dump.h"
 

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

diff --git a/src/io/inet.c b/src/io/inet.c
index 3683d91..723c83c 100644 (file)
--- a/src/io/inet.c
+++ b/src/io/inet.c
@@ -2,7 +2,7 @@
 
 #include "system/angband.h"
 #include "util/util.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "io/inet.h"
 
 

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 866100f..fd2afe0 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 "io/chuukei.h"
 #include "player/player-move.h" // do_cmd_travel() がある。後で移設する.
-#include "io/files.h"
+#include "io/files-util.h"
 
 #include "cmd/cmd-activate.h"
 #include "cmd/cmd-autopick.h"

diff --git a/src/io/load.c b/src/io/load.c
index d41cac6..31d83a8 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 "io/files.h"
+#include "io/files-util.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 f4e312f..e3ebd4e 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 "io/files.h"
+#include "io/files-util.h"
 #include "io/player-status-dump.h"
 
 

diff --git a/src/io/read-pref-file.c b/src/io/read-pref-file.c
index c83bef3..0a6daea 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 "io/files.h" // 暫定。コールバック化して後で消す.
+#include "io/files-util.h" // 暫定。コールバック化して後で消す.
 #include "world/world.h"
 #include "system/system-variables.h"
 #include "autopick/autopick-reader-writer.h"

diff --git a/src/io/report.h b/src/io/report.h
index 348658f..6bcc999 100644 (file)
--- a/src/io/report.h
+++ b/src/io/report.h
@@ -3,7 +3,7 @@
 extern concptr screen_dump;
 
 #ifdef WORLD_SCORE
-#include "io/files.h"
+#include "io/files-util.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/io/save.c b/src/io/save.c
index 59eb424..fb7c669 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 "io/files.h"
+#include "io/files-util.h"
 #include "world/world.h"
 #include "object/object-kind.h"
 #include "monster/monster-race.h"

diff --git a/src/io/write-diary.c b/src/io/write-diary.c
index a7548e4..f157848 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 "dungeon/quest.h"
-#include "io/files.h"
+#include "io/files-util.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 efed953..b608ca4 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 "main/init.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "core/scores.h"
 #include "dungeon/quest.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "system/system-variables.h"
 #include "core/game-play.h"
 #include "system/angband-version.h"

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

diff --git a/src/market/building.c b/src/market/building.c
index 2f6b5ff..baa6f11 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 "io/files.h"
+#include "io/files-util.h"
 #include "player/player-status.h"
 #include "player/player-effects.h"
 #include "player/player-class.h"

diff --git a/src/market/rumor.c b/src/market/rumor.c
index 09f214d..7291ed1 100644 (file)
--- a/src/market/rumor.c
+++ b/src/market/rumor.c
@@ -3,7 +3,7 @@
 #include "util/util.h"
 
 #include "io/tokenizer.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "object/object-flavor.h"
 #include "object/artifact.h"
 #include "dungeon/dungeon.h"

diff --git a/src/market/store.c b/src/market/store.c
index de8ab4f..03127fe 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 "combat/snipe.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "player/player-effects.h"
 #include "player/race-info-table.h"
 #include "mind/mind.h"

diff --git a/src/monster/monster-move.c b/src/monster/monster-move.c
index a68c27d..cf92503 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 "monster/creature.h"
-#include "io/files.h"
+#include "io/files-util.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 f91f4b0..0878902 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 "io/files.h"
+#include "io/files-util.h"
 #include "player/player-effects.h"
 #include "player/player-personalities-table.h"
 #include "view/display-main-window.h"

diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index b402184..90f3159 100644 (file)
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -36,7 +36,7 @@
 #include "floor/wild.h"
 #include "object/warning.h"
 #include "mspell/monster-spell.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "view/display-main-window.h"
 #include "world/world.h"
 #include "monster/monster-race.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index 023a8c7..0b7d6a5 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 "io/files.h"
+#include "io/files-util.h"
 #include "floor/floor.h"
 #include "io/targeting.h"
 #include "player/player-races-table.h"

diff --git a/src/object/artifact.c b/src/object/artifact.c
index d169c07..ff00896 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 "io/files.h"
+#include "io/files-util.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 12df9aa..5ef20ae 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 "combat/snipe.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "world/world.h"
 #include "monster/monster-race.h"
 #include "object/object-ego.h"

diff --git a/src/object/object1.c b/src/object/object1.c
index 110081a..9b29129 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 "io/files.h"
+#include "io/files-util.h"
 #include "term/gameterm.h"
 #include "cmd-smith.h"
 #include "combat/snipe.h"

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

diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index c59ea88..ef8fffd 100644 (file)
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -47,7 +47,7 @@
 #include "player/player-damage.h"
 #include "monster/monster-status.h"
 #include "combat/snipe.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "mspell/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 7ac0358..65eef97 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -44,7 +44,7 @@
 #include "melee.h"
 #include "world/world.h"
 #include "view/display-main-window.h"
-#include "io/files.h"
+#include "io/files-util.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 25726c1..5a8d354 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 "io/files.h"
+#include "io/files-util.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 2f657a8..195b583 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 "io/files.h"
+#include "io/files-util.h"
 #include "world/world.h"
 #include "term/gameterm.h"
 

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 6ebba8b..57eaad4 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -52,7 +52,7 @@
 #include "cmd/cmd-dump.h"
 #include "combat/snipe.h"
 #include "floor/floor-save.h"
-#include "io/files.h"
+#include "io/files-util.h"
 #include "player/player-effects.h"
 #include "player/player-skill.h"
 #include "player/player-personalities-table.h"

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

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 98cea43..bc82163 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 "io/files.h"
+#include "io/files-util.h"
 #include "world/world.h"
 #include "dungeon/quest.h"
 #include "object/artifact.h"

diff --git a/src/view/display-player.h b/src/view/display-player.h
index 742ecd6..890d1c3 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 "io/files.h"
+#include "io/files-util.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/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index b39b2a9..7acf8de 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 "io/files.h"
+#include "io/files-util.h"
 #include "mspell/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 6406fed..fd04f6d 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 "io/files.h"
+#include "io/files-util.h"
 
  /*
   * The spoiler file being created