[Refactor] #37353 cmd4.c を cmd-dump.c に改名して関数整理．

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 84f264a..bf33ffa 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -143,6 +143,7 @@
     <ClCompile Include="..\..\src\chuukei.c" />\r
     <ClCompile Include="..\..\src\cmd-activate.c" />\r
     <ClCompile Include="..\..\src\cmd-basic.c" />\r
+    <ClCompile Include="..\..\src\cmd-dump.c" />\r
     <ClCompile Include="..\..\src\cmd-eat.c" />\r
     <ClCompile Include="..\..\src\cmd-hissatsu.c" />\r
     <ClCompile Include="..\..\src\cmd-mane.c" />\r
@@ -204,6 +205,7 @@
     <ClInclude Include="..\..\src\chest.h" />\r
     <ClInclude Include="..\..\src\chuukei.h" />\r
     <ClInclude Include="..\..\src\cmd-basic.h" />\r
+    <ClInclude Include="..\..\src\cmd-dump.h" />\r
     <ClInclude Include="..\..\src\cmd-hissatsu.h" />\r
     <ClInclude Include="..\..\src\cmd-item.h" />\r
     <ClInclude Include="..\..\src\cmd-magiceat.h" />\r
@@ -217,7 +219,6 @@
     </ClInclude>\r
     <ClCompile Include="..\..\src\player-move.c" />\r
     <ClCompile Include="..\..\src\cmd-item.c" />\r
-    <ClCompile Include="..\..\src\cmd4.c" />\r
     <ClCompile Include="..\..\src\cmd-magiceat.c" />\r
     <ClCompile Include="..\..\src\cmd-spell.c" />\r
     <ClCompile Include="..\..\src\files.c" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index a638c0e..f3e668f 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -31,9 +31,6 @@
     <ClCompile Include="..\..\src\z-util.c" />
     <ClCompile Include="..\..\src\z-virt.c" />
     <ClCompile Include="..\..\src\warning.c" />
-    <ClCompile Include="..\..\src\cmd4.c">
-      <Filter>cmd</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\cmd-activate.c">
       <Filter>cmd</Filter>
     </ClCompile>
@@ -345,6 +342,9 @@
     <ClCompile Include="..\..\src\player-sex.c">
       <Filter>player</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\cmd-dump.c">
+      <Filter>cmd</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\angband.h" />
@@ -655,6 +655,9 @@
     <ClInclude Include="..\..\src\player-sex.h">
       <Filter>player</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\cmd-dump.h">
+      <Filter>cmd</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index c736775..5d9468b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,7 @@ hengband_SOURCES = \
        avatar.h avatar.c birth.c birth.h \
        \
        bldg.c bldg.h chest.c chest.h chuukei.c \
-       cmd-basic.c cmd-basic.h cmd4.c cmd-activate.c cmd-activate.h cmd-eat.c cmd-eat.h \
+       cmd-basic.c cmd-basic.h cmd-dump.c cmd-dump.h cmd-activate.c cmd-activate.h cmd-eat.c cmd-eat.h \
        cmd-item.c cmd-item.h cmd-magiceat.c cmd-magiceat.h \
        cmd-mane.c cmd-mane.h cmd-pet.c cmd-pet.h \
        cmd-quaff.c cmd-quaff.h cmd-read.c cmd-read.h cmd-spell.c cmd-spell.h \

diff --git a/src/birth.c b/src/birth.c
index c239e91..194d82b 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -17,6 +17,7 @@
 
 #include "artifact.h"
 #include "avatar.h"
+#include "cmd-dump.h"
 #include "history.h"
 #include "monsterrace-hook.h"
 #include "store.h"

diff --git a/src/bldg.c b/src/bldg.c
index ae498f2..8c0dbe6 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -15,6 +15,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "cmd-dump.h"
 #include "floor.h"
 #include "floor-events.h"
 #include "floor-save.h"

diff --git a/src/chuukei.c b/src/chuukei.c
index 1dfbf41..af4b6cd 100644 (file)
--- a/src/chuukei.c
+++ b/src/chuukei.c
@@ -9,6 +9,7 @@
 #include "angband.h"
 
 #include "util.h"
+#include "cmd-dump.h"
 
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 620e891..93fb804 100644 (file)
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "cmd-dump.h"
 #include "chest.h"
 #include "trap.h"
 #include "dungeon.h"

diff --git a/src/cmd4.c b/src/cmd-dump.c
similarity index 99%
rename from src/cmd4.c
rename to src/cmd-dump.c
index c7dab98..91d4344 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd-dump.c
@@ -41,6 +41,8 @@
 
 #include "angband.h"
 #include "util.h"
+#include "cmd-dump.h"
+
 #include "autopick.h"
 
 #include "birth.h"

diff --git a/src/cmd-dump.h b/src/cmd-dump.h
new file mode 100644 (file)
index 0000000..f72c2d2
--- /dev/null
+++ b/src/cmd-dump.h
@@ -0,0 +1,32 @@
+#pragma once
+
+/* cmd4.c */
+#ifndef JP
+extern concptr get_ordinal_number_suffix(int num);
+#endif
+extern errr do_cmd_write_nikki(int type, int num, concptr note);
+extern void do_cmd_nikki(void);
+extern void do_cmd_redraw(void);
+extern void do_cmd_change_name(void);
+extern void do_cmd_message_one(void);
+extern void do_cmd_messages(int num_now);
+extern void do_cmd_options_aux(int page, concptr info);
+extern void do_cmd_options(void);
+extern void do_cmd_pref(void);
+extern void do_cmd_reload_autopick(void);
+extern void do_cmd_macros(void);
+extern void do_cmd_visuals(void);
+extern void do_cmd_colors(void);
+extern void do_cmd_note(void);
+extern void do_cmd_version(void);
+extern void do_cmd_feeling(void);
+extern void do_cmd_load_screen(void);
+extern void do_cmd_save_screen_html_aux(char *filename, int message);
+extern void do_cmd_save_screen(void);
+extern void do_cmd_knowledge_quests_completed(FILE *fff, QUEST_IDX quest_num[]);
+extern void do_cmd_knowledge_quests_failed(FILE *fff, QUEST_IDX quest_num[]);
+extern void do_cmd_knowledge(void);
+extern void plural_aux(char * Name);
+extern void do_cmd_checkquest(void);
+extern void do_cmd_time(void);
+extern void do_cmd_suicide(void);
\ No newline at end of file

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index f49025f..1c5e1cd 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "cmd-dump.h"
 #include "floor.h"
 #include "grid.h"
 #include "melee.h"

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index e614373..912cc9e 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -9,6 +9,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "cmd-dump.h"
 #include "selfinfo.h"
 #include "spells.h"
 #include "spells-summon.h"

diff --git a/src/core.c b/src/core.c
index 88c94aa..d390bbe 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -16,6 +16,7 @@
 #include "birth.h"
 #include "bldg.h"
 #include "cmd-activate.h"
+#include "cmd-dump.h"
 #include "cmd-eat.h"
 #include "cmd-hissatsu.h"
 #include "cmd-item.h"

diff --git a/src/externs.h b/src/externs.h
index c186c34..50f860f 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -276,36 +276,6 @@ extern FEAT_IDX feat_ground_type[100], feat_wall_type[100];
 extern COMMAND_CODE now_message;
 extern bool use_menu;
 
-/* cmd4.c */
-#ifndef JP
-extern concptr get_ordinal_number_suffix(int num);
-#endif
-extern errr do_cmd_write_nikki(int type, int num, concptr note);
-extern void do_cmd_nikki(void);
-extern void do_cmd_redraw(void);
-extern void do_cmd_change_name(void);
-extern void do_cmd_message_one(void);
-extern void do_cmd_messages(int num_now);
-extern void do_cmd_options_aux(int page, concptr info);
-extern void do_cmd_options(void);
-extern void do_cmd_pref(void);
-extern void do_cmd_reload_autopick(void);
-extern void do_cmd_macros(void);
-extern void do_cmd_visuals(void);
-extern void do_cmd_colors(void);
-extern void do_cmd_note(void);
-extern void do_cmd_version(void);
-extern void do_cmd_feeling(void);
-extern void do_cmd_load_screen(void);
-extern void do_cmd_save_screen_html_aux(char *filename, int message);
-extern void do_cmd_save_screen(void);
-extern void do_cmd_knowledge_quests_completed(FILE *fff, QUEST_IDX quest_num[]);
-extern void do_cmd_knowledge_quests_failed(FILE *fff, QUEST_IDX quest_num[]);
-extern void do_cmd_knowledge(void);
-extern void plural_aux(char * Name);
-extern void do_cmd_checkquest(void);
-extern void do_cmd_time(void);
-extern void do_cmd_suicide(void);
 
 /* dungeon.c */
 extern void play_game(bool new_game);

diff --git a/src/files.c b/src/files.c
index ee4d25b..7c29484 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -21,6 +21,7 @@
 
 #include "bldg.h"
 
+#include "cmd-dump.h"
 #include "world.h"
 #include "player-race.h"
 #include "player-status.h"

diff --git a/src/floor-events.c b/src/floor-events.c
index 09a27e9..e1c8df0 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -14,6 +14,7 @@
 #include "player-effects.h"
 #include "objectkind.h"
 #include "object-ego.h"
+#include "cmd-dump.h"
 
 static bool mon_invis;
 static POSITION mon_fy, mon_fx;

diff --git a/src/floor-generate.c b/src/floor-generate.c
index 3b27579..acf2c26 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -100,6 +100,7 @@
 #include "util.h"
 #include "bldg.h"
 
+#include "cmd-dump.h"
 #include "grid.h"
 #include "rooms.h"
 #include "dungeon.h"

diff --git a/src/floor-save.c b/src/floor-save.c
index e31d4ad..7b84892 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -32,6 +32,7 @@
 #include "player-effects.h"
 #include "world.h"
 #include "spells.h"
+#include "cmd-dump.h"
 
 static FLOOR_IDX new_floor_id;  /*!<次のフロアのID / floor_id of the destination */
 static u32b change_floor_mode;  /*!<フロア移行処理に関するフラグ / Mode flags for changing floor */

diff --git a/src/main-win.c b/src/main-win.c
index 75a8278..86389ac 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -100,6 +100,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "cmd-dump.h"
 #include "view-mainwindow.h"
 #include "floor.h"
 #include "floor-events.h"

diff --git a/src/monster-process.c b/src/monster-process.c
index 9056d1d..9acd600 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -16,6 +16,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "cmd-dump.h"
 #include "cmd-pet.h"
 #include "melee.h"
 #include "spells.h"

diff --git a/src/monster-status.c b/src/monster-status.c
index b0075e0..200a2dd 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "cmd-dump.h"
 #include "dungeon.h"
 #include "floor.h"
 #include "grid.h"

diff --git a/src/monster1.c b/src/monster1.c
index b24c2bf..48d8593 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "cmd-dump.h"
 #include "bldg.h"
 #include "cmd-pet.h"
 #include "floor.h"

diff --git a/src/monster2.c b/src/monster2.c
index c7935c0..40213be 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "cmd-dump.h"
 #include "cmd-pet.h"
 #include "dungeon.h"
 #include "floor.h"

diff --git a/src/mutation.c b/src/mutation.c
index 0d70e3c..d57f9ea 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -14,6 +14,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "cmd-dump.h"
 #include "mutation.h"
 
 #include "selfinfo.h"

diff --git a/src/object2.c b/src/object2.c
index 7c859ae..2637dc1 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -16,6 +16,7 @@
 
 #include "object.h"
 
+#include "cmd-dump.h"
 #include "spells.h"
 #include "dungeon.h"
 #include "floor.h"

diff --git a/src/patron.c b/src/patron.c
index 4873e24..f5e40f3 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -2,6 +2,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "cmd-dump.h"
 #include "patron.h"
 #include "cmd-pet.h"
 #include "object-curse.h"

diff --git a/src/player-effects.c b/src/player-effects.c
index 3529728..2f6385b 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -16,6 +16,7 @@
 #include "util.h"
 
 #include "artifact.h"
+#include "cmd-dump.h"
 #include "floor.h"
 #include "bldg.h"
 #include "birth.h"

diff --git a/src/player-status.c b/src/player-status.c
index a4e73bc..a714010 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -29,6 +29,7 @@
 #include "objectkind.h"
 #include "monsterrace.h"
 #include "autopick.h"
+#include "cmd-dump.h"
 
 /*!
  * @var horror_desc

diff --git a/src/quest.c b/src/quest.c
index 35be289..5c8f65d 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -12,6 +12,7 @@
 #include "artifact.h"
 #include "feature.h"
 #include "world.h"
+#include "cmd-dump.h"
 
 /*
  * Quest info

diff --git a/src/scores.c b/src/scores.c
index 08627d9..4d11717 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -22,6 +22,7 @@
 #include "scores.h"
 #include "floor.h"
 #include "world.h"
+#include "cmd-dump.h"
 
 /*!
  * @brief i番目のスコア情報にバッファ位置をシークする / Seek score 'i' in the highscore file

diff --git a/src/spells1.c b/src/spells1.c
index d87df7a..ba455db 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -15,6 +15,7 @@
 #include "util.h"
 
 #include "cmd-pet.h"
+#include "cmd-dump.h"
 #include "floor.h"
 #include "trap.h"
 #include "autopick.h"

diff --git a/src/spells2.c b/src/spells2.c
index 395f86e..c00a8db 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -16,6 +16,7 @@
 
 #include "artifact.h"
 #include "cmd-pet.h"
+#include "cmd-dump.h"
 #include "floor.h"
 #include "grid.h"
 #include "trap.h"

diff --git a/src/spells3.c b/src/spells3.c
index edcc74d..d909132 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -36,6 +36,7 @@
 #include "monster-status.h"
 #include "monster-spell.h"
 #include "cmd-spell.h"
+#include "cmd-dump.h"
 #include "snipe.h"
 #include "floor-save.h"
 #include "files.h"

diff --git a/src/store.c b/src/store.c
index cb87718..887b0fb 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -14,6 +14,7 @@
 #include "util.h"
 
 #include "floor.h"
+#include "cmd-dump.h"
 #include "cmd-item.h"
 #include "cmd-smith.h"
 #include "cmd-zapwand.h"

diff --git a/src/trap.c b/src/trap.c
index ddde065..e75729f 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "cmd-dump.h"
 #include "trap.h"
 #include "player-damage.h"
 #include "player-move.h"

diff --git a/src/util.c b/src/util.c
index 8167232..da3acc7 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -17,6 +17,7 @@
 #include "quest.h"
 #include "floor.h"
 #include "world.h"
+#include "cmd-dump.h"
 
 
 static int num_more = 0;

diff --git a/src/wizard2.c b/src/wizard2.c
index f47bdeb..293cb78 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "dungeon.h"
+#include "cmd-dump.h"
 #include "util.h"
 #include "birth.h"
 #include "selfinfo.h"