[Refactor] #40457 Moved io-dump-related files from io/ to io-dump/

diff --git a/src/Makefile.am b/src/Makefile.am
index 5dbe276..1a6ce67 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,15 +104,11 @@ hengband_SOURCES = \
        player/temporary-resistances.c player/temporary-resistances.h \
        player/digestion-processor.c player/digestion-processor.h \
        \
-       io/character-dump.c io/character-dump.h \
-       io/dump-remover.c io/dump-remover.h \
        io/files-util.c io/files-util.h \
        io/gf-descriptions.c io/gf-descriptions.h \
        io/targeting.c io/targeting.h \
        io/tokenizer.c io/tokenizer.h \
        io/interpret-pref-file.c io/interpret-pref-file.h \
-       io/player-status-dump.c io/player-status-dump.h \
-       io/special-class-dump.c io/special-class-dump.h \
        io/read-pref-file.c io/read-pref-file.h \
        io/exit-panic.c io/exit-panic.h \
        io/write-diary.c io/write-diary.h \
@@ -127,6 +123,12 @@ hengband_SOURCES = \
        io/chuukei.c io/chuukei.h \
        io/pref-file-expressor.c io/pref-file-expressor.h \
        \
+       io-dump/character-dump.c io-dump/character-dump.h \
+       io-dump/dump-remover.c io-dump/dump-remover.h \
+       io-dump/dump-util.c io-dump/dump-util.h \
+       io-dump/player-status-dump.c io-dump/player-status-dump.h \
+       io-dump/special-class-dump.c io-dump/special-class-dump.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 \
@@ -140,6 +142,7 @@ hengband_SOURCES = \
        core/player-processor.c core/player-processor.h \
        core/scores.c core/scores.h \
        core/sort.c core/sort.h \
+       \
        dungeon/dungeon.c dungeon/dungeon.h \
        dungeon/dungeon-processor.c dungeon/dungeon-processor.h \
        dungeon/dungeon-file.c dungeon/dungeon-file.h \
@@ -399,8 +402,6 @@ hengband_SOURCES = \
        combat/shoot.c combat/shoot.h \
        combat/snipe.c combat/snipe.h \
        \
-       io-dump/dump-util.c io-dump/dump-util.h \
-       \
        term/gameterm.c term/gameterm.h \
        term/z-form.c term/z-form.h term/z-rand.c term/z-rand.h \
        term/z-term.c term/z-term.h term/z-util.c term/z-util.h \
@@ -427,9 +428,9 @@ LIBS += $(XFT_LIBS)
 COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
        -Iautopick -Ibirth -Icmd -Icmd-io -Icmd-item -Icombat -Icore -Idungeon \
-       -Ieffect -Ifloor -Igrid -Iinventory -Iio -Iknowledge -Imarket -Imind \
-       -Imonster -Imspell -Imutation -Iobject -Ipet -Iplayer -Irealm -Iroom \
-       -Ispell -Isystem -Iterm -Iutil -Iview -Iwizard -Iworld
+       -Ieffect -Ifloor -Igrid -Iinventory -Iio -Iio-dump -Iknowledge -Imarket \
+       -Imind -Imonster -Imspell -Imutation -Iobject -Ipet -Iplayer -Irealm \
+       -Iroom -Ispell -Isystem -Iterm -Iutil -Iview -Iwizard -Iworld
 
 install-exec-hook:
 if SET_GID

diff --git a/src/cmd-io/cmd-dump.c b/src/cmd-io/cmd-dump.c
index e01699e..96fa1c5 100644 (file)
--- a/src/cmd-io/cmd-dump.c
+++ b/src/cmd-io/cmd-dump.c
@@ -35,7 +35,7 @@
 #include "floor/floor.h"
 #include "term/gameterm.h"
 #include "system/angband-version.h"
-#include "io/dump-remover.h"
+#include "io-dump/dump-remover.h"
 #include "io/read-pref-file.h"
 #include "io/interpret-pref-file.h"
 

diff --git a/src/io-dump/character-dump.c b/src/io-dump/character-dump.c
index b09c1c6..abd04c3 100644 (file)
--- a/src/io-dump/character-dump.c
+++ b/src/io-dump/character-dump.c
@@ -1,4 +1,4 @@
-#include "io/character-dump.h"
+#include "io-dump/character-dump.h"
 #include "system/angband-version.h"
 #include "floor/floor.h"
 #include "world/world.h"
@@ -13,8 +13,8 @@
 #include "io/mutations-dump.h"
 #include "object/object-flavor.h"
 #include "knowledge/knowledge-quests.h"
-#include "io/special-class-dump.h"
-#include "io/player-status-dump.h"
+#include "io-dump/special-class-dump.h"
+#include "io-dump/player-status-dump.h"
 #include "io/write-diary.h"
 #include "player/avatar.h"
 #include "store/store-util.h"

diff --git a/src/io-dump/dump-remover.c b/src/io-dump/dump-remover.c
index c42c81d..63c0b7f 100644 (file)
--- a/src/io-dump/dump-remover.c
+++ b/src/io-dump/dump-remover.c
@@ -1,6 +1,5 @@
-#include "system/angband.h"
+#include "io-dump/dump-remover.h"
 #include "io-dump/dump-util.h"
-#include "io/dump-remover.h"
 #include "io/read-pref-file.h"
 
 /*!

diff --git a/src/io-dump/dump-remover.h b/src/io-dump/dump-remover.h
index f720985..4538330 100644 (file)
--- a/src/io-dump/dump-remover.h
+++ b/src/io-dump/dump-remover.h
@@ -1,3 +1,5 @@
 #pragma once
 
+#include "system/angband.h"
+
 void remove_auto_dump(concptr orig_file, concptr auto_dump_mark);

diff --git a/src/io-dump/player-status-dump.c b/src/io-dump/player-status-dump.c
index e3ebd4e..ccbf17f 100644 (file)
--- a/src/io-dump/player-status-dump.c
+++ b/src/io-dump/player-status-dump.c
@@ -1,7 +1,4 @@
-#include "system/angband.h"
-#include "io/files-util.h"
-#include "io/player-status-dump.h"
-
+#include "io-dump/player-status-dump.h"
 
 /*!
  * @brief 画面番号を指定してダンプする

diff --git a/src/io-dump/player-status-dump.h b/src/io-dump/player-status-dump.h
index 4d9de40..900493e 100644 (file)
--- a/src/io-dump/player-status-dump.h
+++ b/src/io-dump/player-status-dump.h
@@ -1,3 +1,6 @@
 #pragma once
 
+#include "system/angband.h"
+#include "io/files-util.h"
+
 void dump_aux_player_status(player_type *creature_ptr, FILE *fff, display_player_pf display_player, map_name_pf map_name);

diff --git a/src/io-dump/special-class-dump.c b/src/io-dump/special-class-dump.c
index 3d6e519..4678d26 100644 (file)
--- a/src/io-dump/special-class-dump.c
+++ b/src/io-dump/special-class-dump.c
@@ -4,8 +4,7 @@
  * @author Hourier
  */
 
-#include "system/angband.h"
-#include "special-class-dump.h"
+#include "io-dump/special-class-dump.h"
 #include "cmd-item/cmd-magiceat.h"
 #include "cmd-item/cmd-smith.h"
 #include "object/object2.h"

diff --git a/src/io-dump/special-class-dump.h b/src/io-dump/special-class-dump.h
index a6511c6..4769b73 100644 (file)
--- a/src/io-dump/special-class-dump.h
+++ b/src/io-dump/special-class-dump.h
@@ -1,3 +1,5 @@
 #pragma once
 
+#include "system/angband.h"
+
 void dump_aux_class_special(player_type *creature_ptr, FILE *fff);

diff --git a/src/io/files-util.c b/src/io/files-util.c
index 8e16136..f1355a1 100644 (file)
--- a/src/io/files-util.c
+++ b/src/io/files-util.c
@@ -14,7 +14,7 @@
 #include "system/angband.h"
 #include "io/uid-checker.h"
 #include "io/files-util.h"
-#include "io/character-dump.h"
+#include "io-dump/character-dump.h"
 
 concptr ANGBAND_DIR; //!< Path name: The main "lib" directory This variable is not actually used anywhere in the code
 concptr ANGBAND_DIR_APEX; //!< High score files (binary) These files may be portable between platforms

diff --git a/src/io/read-pref-file.c b/src/io/read-pref-file.c
index c35c5d1..107db5a 100644 (file)
--- a/src/io/read-pref-file.c
+++ b/src/io/read-pref-file.c
@@ -15,7 +15,7 @@
  */
 
 #include "system/angband.h"
-#include "io/dump-remover.h"
+#include "io-dump/dump-remover.h"
 #include "io/read-pref-file.h"
 #include "io/interpret-pref-file.h"
 #include "autopick/autopick-pref-processor.h"

diff --git a/src/io/report.c b/src/io/report.c
index 9d0b56e..11c8dd7 100644 (file)
--- a/src/io/report.c
+++ b/src/io/report.c
@@ -15,7 +15,7 @@
 #include "dungeon/dungeon.h"
 
 #include "player/player-personality.h"
-#include "io/character-dump.h"
+#include "io-dump/character-dump.h"
 #include "world/world.h"
 #include "term/gameterm.h"