[Refactor] #39962 Separated cmd-help.c/h from files.c

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index b7569fa..9308efe 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -161,6 +161,7 @@
     <ClCompile Include="..\..\src\cmd\cmd-dump.c" />\r
     <ClCompile Include="..\..\src\cmd\cmd-eat.c" />\r
     <ClCompile Include="..\..\src\cmd\cmd-gameoption.c" />\r
+    <ClCompile Include="..\..\src\cmd\cmd-help.c" />\r
     <ClCompile Include="..\..\src\cmd\cmd-hissatsu.c" />\r
     <ClCompile Include="..\..\src\cmd\cmd-item.c" />\r
     <ClCompile Include="..\..\src\cmd\cmd-magiceat.c" />\r
@@ -317,6 +318,7 @@
     <ClInclude Include="..\..\src\cmd\cmd-dump.h" />\r
     <ClInclude Include="..\..\src\cmd\cmd-eat.h" />\r
     <ClInclude Include="..\..\src\cmd\cmd-gameoption.h" />\r
+    <ClInclude Include="..\..\src\cmd\cmd-help.h" />\r
     <ClInclude Include="..\..\src\cmd\cmd-hissatsu.h" />\r
     <ClInclude Include="..\..\src\cmd\cmd-item.h" />\r
     <ClInclude Include="..\..\src\cmd\cmd-magiceat.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 0d0abeb..588607b 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -457,6 +457,9 @@
     <ClCompile Include="..\..\src\io\process-pref-file.c">
       <Filter>io</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\cmd\cmd-help.c">
+      <Filter>cmd</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -896,6 +899,9 @@
     <ClInclude Include="..\..\src\io\process-pref-file.h">
       <Filter>io</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\cmd\cmd-help.h">
+      <Filter>cmd</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 363a595..cababb5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -117,7 +117,7 @@ hengband_SOURCES = \
        \
        cmd/cmd-activate.c cmd/cmd-activate.h cmd/cmd-basic.c cmd/cmd-basic.h \
        cmd/cmd-dump.c cmd/cmd-dump.h cmd/cmd-eat.c cmd/cmd-eat.h \
-       cmd/cmd-gameoption.c cmd/cmd-gameoption.h \
+       cmd/cmd-gameoption.c cmd/cmd-gameoption.h cmd/cmd-help.c cmd/cmd-help.h \
        cmd/cmd-hissatsu.c cmd/cmd-hissatsu.h cmd/cmd-item.c cmd/cmd-item.h \
        cmd/cmd-magiceat.c cmd/cmd-magiceat.h cmd/cmd-mane.c cmd/cmd-mane.h \
        cmd/cmd-pet.c cmd/cmd-pet.h cmd/cmd-quaff.c cmd/cmd-quaff.h \

diff --git a/src/birth.c b/src/birth.c
index a361b76..8d6ca1e 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -40,8 +40,8 @@
 #include "cmd-pet.h"
 #include "dungeon-file.h"
 #include "floor-town.h"
-#include "files.h"
 #include "birth.h"
+#include "cmd/cmd-help.h"
 #include "player-race.h"
 #include "player-skill.h"
 #include "world.h"

diff --git a/src/cmd/cmd-help.c b/src/cmd/cmd-help.c
new file mode 100644 (file)
index 0000000..eb25e7e
--- /dev/null
+++ b/src/cmd/cmd-help.c
@@ -0,0 +1,16 @@
+#include "cmd/cmd-help.h"
+#include "files.h"
+
+/*!
+ * @brief ヘルプを表示するコマンドのメインルーチン
+ * Peruse the On-Line-Help
+ * @param creature_ptr プレーヤーへの参照ポインタ
+ * @return なし
+ * @details
+ */
+void do_cmd_help(player_type *creature_ptr)
+{
+       screen_save();
+       (void)show_file(creature_ptr, TRUE, _("jhelp.hlp", "help.hlp"), NULL, 0, 0);
+       screen_load();
+}

diff --git a/src/cmd/cmd-help.h b/src/cmd/cmd-help.h
new file mode 100644 (file)
index 0000000..b141d9e
--- /dev/null
+++ b/src/cmd/cmd-help.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+void do_cmd_help(player_type *creature_ptr);

diff --git a/src/core.c b/src/core.c
index 1d11a65..793dfcb 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -22,20 +22,21 @@
 
 #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"
-#include "cmd-magiceat.h"
-#include "cmd-mane.h"
-#include "cmd-quaff.h"
-#include "cmd-read.h"
-#include "cmd-smith.h"
-#include "cmd-usestaff.h"
-#include "cmd-zaprod.h"
-#include "cmd-zapwand.h"
-#include "cmd-pet.h"
+#include "cmd/cmd-activate.h"
+#include "cmd/cmd-dump.h"
+#include "cmd/cmd-eat.h"
+#include "cmd/cmd-help.h"
+#include "cmd/cmd-hissatsu.h"
+#include "cmd/cmd-item.h"
+#include "cmd/cmd-magiceat.h"
+#include "cmd/cmd-mane.h"
+#include "cmd/cmd-quaff.h"
+#include "cmd/cmd-read.h"
+#include "cmd/cmd-smith.h"
+#include "cmd/cmd-usestaff.h"
+#include "cmd/cmd-zaprod.h"
+#include "cmd/cmd-zapwand.h"
+#include "cmd/cmd-pet.h"
 #include "cmd-basic.h"
 #include "racial.h"
 #include "snipe.h"

diff --git a/src/files.c b/src/files.c
index 55d3602..bfc5d31 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -976,21 +976,6 @@ bool show_file(player_type *creature_ptr, bool show_version, concptr name, concp
 
 
 /*!
- * @brief ヘルプを表示するコマンドのメインルーチン
- * Peruse the On-Line-Help
- * @param creature_ptr プレーヤーへの参照ポインタ
- * @return なし
- * @details
- */
-void do_cmd_help(player_type *creature_ptr)
-{
-       screen_save();
-       (void)show_file(creature_ptr, TRUE, _("jhelp.hlp", "help.hlp"), NULL, 0, 0);
-       screen_load();
-}
-
-
-/*!
  * @brief プレイヤーの名前をチェックして修正する
  * Process the player name.
  * @param player_ptr プレーヤーへの参照ポインタ

diff --git a/src/files.h b/src/files.h
index aa28622..ee34710 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -26,7 +26,6 @@ extern errr process_pref_file(player_type *creature_ptr, concptr name);
 extern errr process_autopick_file(player_type *creature_ptr, concptr name);
 extern errr process_histpref_file(player_type *creature_ptr, concptr name);
 extern bool show_file(player_type *player_ptr, bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode);
-extern void do_cmd_help(player_type *creature_ptr);
 extern void process_player_name(player_type *creature_ptr, bool sf);
 extern void get_name(player_type *creature_ptr);
 extern void do_cmd_save_game(player_type *creature_ptr, int is_autosave);

diff --git a/src/store.c b/src/store.c
index 7dc9d5a..7cbc5b8 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -16,12 +16,13 @@
 #include "term.h"
 
 #include "floor.h"
-#include "cmd-basic.h"
-#include "cmd-dump.h"
-#include "cmd-item.h"
-#include "cmd-smith.h"
-#include "cmd-zapwand.h"
-#include "cmd-magiceat.h"
+#include "cmd/cmd-basic.h"
+#include "cmd/cmd-dump.h"
+#include "cmd/cmd-help.h"
+#include "cmd/cmd-item.h"
+#include "cmd/cmd-smith.h"
+#include "cmd/cmd-zapwand.h"
+#include "cmd/cmd-magiceat.h"
 #include "spells.h"
 #include "store.h"
 #include "avatar.h"

diff --git a/src/wizard2.c b/src/wizard2.c
index 7088a24..94bbbe0 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -15,7 +15,8 @@
 #include "term.h"
 
 #include "dungeon.h"
-#include "cmd-dump.h"
+#include "cmd/cmd-dump.h"
+#include "cmd/cmd-help.h"
 #include "util.h"
 #include "birth.h"
 #include "selfinfo.h"