[Refactor] #40236 Separated knowledge-self.c/h from cmd-dump.c/h

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index ffb462c..4a593a4 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -157,6 +157,7 @@
     <ClCompile Include="..\..\src\knowledge\knowledge-artifacts.c" />\r
     <ClCompile Include="..\..\src\knowledge\knowledge-experiences.c" />\r
     <ClCompile Include="..\..\src\knowledge\knowledge-quests.c" />\r
+    <ClCompile Include="..\..\src\knowledge\knowledge-self.c" />\r
     <ClCompile Include="..\..\src\knowledge\knowledge-uniques.c" />\r
     <ClCompile Include="..\..\src\main\music-definitions-table.c" />\r
     <ClCompile Include="..\..\src\main\sound-definitions-table.c" />\r
@@ -287,6 +288,7 @@
     <ClInclude Include="..\..\src\knowledge\knowledge-artifacts.h" />\r
     <ClInclude Include="..\..\src\knowledge\knowledge-experiences.h" />\r
     <ClInclude Include="..\..\src\knowledge\knowledge-quests.h" />\r
+    <ClInclude Include="..\..\src\knowledge\knowledge-self.h" />\r
     <ClInclude Include="..\..\src\knowledge\knowledge-uniques.h" />\r
     <ClInclude Include="..\..\src\main\music-definitions-table.h" />\r
     <ClInclude Include="..\..\src\main\sound-definitions-table.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index c1a4ba5..680a44c 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -610,6 +610,9 @@
     <ClCompile Include="..\..\src\knowledge\knowledge-quests.c">
       <Filter>knowledge</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\knowledge\knowledge-self.c">
+      <Filter>knowledge</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1202,6 +1205,9 @@
     <ClInclude Include="..\..\src\knowledge\knowledge-quests.h">
       <Filter>knowledge</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\knowledge\knowledge-self.h">
+      <Filter>knowledge</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index f395575..5780253 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -152,6 +152,7 @@ hengband_SOURCES = \
        knowledge/knowledge-artifacts.c knowledge/knowledge-artifacts.h \
        knowledge/knowledge-experiences.c knowledge/knowledge-experiences.h \
        knowledge/knowledge-uniques.c knowledge/knowledge-uniques.h \
+       knowledge/knowledge-self.c knowledge/knowledge-self.h \
        knowledge/knowledge-quests.c knowledge/knowledge-quests.h \
        \
        cmd/dump-util.c cmd/dump-util.h cmd/feeling-table.c cmd/feeling-table.h \

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index 2a20ef6..0cf34ee 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -46,10 +46,10 @@
 #include "knowledge/knowledge-artifacts.h"
 #include "knowledge/knowledge-experiences.h"
 #include "knowledge/knowledge-quests.h"
+#include "knowledge/knowledge-self.h"
 #include "knowledge/knowledge-uniques.h"
 
 #include "autopick.h"
-#include "birth.h"
 #include "dungeon.h"
 #include "world.h"
 #include "view/display-player.h" // 暫定。後で消す.
@@ -59,10 +59,8 @@
 #include "quest.h"
 #include "market/store.h"
 #include "artifact.h"
-#include "avatar.h"
 #include "object-flavor.h"
 #include "monster-status.h"
-#include "dungeon-file.h"
 #include "object/object-kind.h"
 #include "floor-town.h"
 #include "cmd/feeling-table.h"
@@ -610,7 +608,7 @@ static void do_cmd_knowledge_pets(player_type *creature_ptr)
 
 
 /*!
- * @brief ç\8f¾å\9c¨ã\81®ã\83\9aã\83\83ã\83\88を表示するコマンドのメインルーチン /
+ * @brief ç\8f¾å\9c¨ã\81¾ã\81§ã\81«å\80\92ã\81\97ã\81\9fã\83¢ã\83³ã\82¹ã\82¿ã\83¼を表示するコマンドのメインルーチン /
  * @param creature_ptr プレーヤーへの参照ポインタ
  * Total kill count
  * @return なし
@@ -1807,21 +1805,6 @@ static void do_cmd_knowledge_bounty(player_type *creature_ptr)
        fd_kill(file_name);
 }
 
-/*
- * List virtues & status
- */
-static void do_cmd_knowledge_virtues(player_type *creature_ptr)
-{
-       FILE *fff = NULL;
-       GAME_TEXT file_name[FILE_NAME_SIZE];
-       if (!open_temporary_file(&fff, file_name)) return;
-
-       fprintf(fff, _("現在の属性 : %s\n\n", "Your alignment : %s\n\n"), your_alignment(creature_ptr));
-       dump_virtues(creature_ptr, fff);
-       my_fclose(fff);
-       (void)show_file(creature_ptr, TRUE, file_name, _("八つの徳", "Virtues"), 0, 0);
-       fd_kill(file_name);
-}
 
 /*
  * Dungeon
@@ -1854,97 +1837,6 @@ static void do_cmd_knowledge_dungeon(player_type *creature_ptr)
 
 
 /*
-* List virtues & status
-*
-*/
-static void do_cmd_knowledge_stat(player_type *creature_ptr)
-{
-       FILE *fff = NULL;
-       GAME_TEXT file_name[FILE_NAME_SIZE];
-       if (!open_temporary_file(&fff, file_name)) return;
-
-       int percent = (int)(((long)creature_ptr->player_hp[PY_MAX_LEVEL - 1] * 200L) /
-               (2 * creature_ptr->hitdie +
-               ((PY_MAX_LEVEL - 1 + 3) * (creature_ptr->hitdie + 1))));
-
-       if (creature_ptr->knowledge & KNOW_HPRATE)
-               fprintf(fff, _("現在の体力ランク : %d/100\n\n", "Your current Life Rating is %d/100.\n\n"), percent);
-       else fprintf(fff, _("現在の体力ランク : ???\n\n", "Your current Life Rating is ???.\n\n"));
-
-       fprintf(fff, _("能力の最大値\n\n", "Limits of maximum stats\n\n"));
-       for (int v_nr = 0; v_nr < A_MAX; v_nr++)
-       {
-               if ((creature_ptr->knowledge & KNOW_STAT) || creature_ptr->stat_max[v_nr] == creature_ptr->stat_max_max[v_nr]) fprintf(fff, "%s 18/%d\n", stat_names[v_nr], creature_ptr->stat_max_max[v_nr] - 18);
-               else fprintf(fff, "%s ???\n", stat_names[v_nr]);
-       }
-
-       dump_yourself(creature_ptr, fff);
-       my_fclose(fff);
-       (void)show_file(creature_ptr, TRUE, file_name, _("自分に関する情報", "HP-rate & Max stat"), 0, 0);
-       fd_kill(file_name);
-}
-
-
-/*
- * List my home
- * @param player_ptr プレーヤーへの参照ポインタ
- * @return なし
- */
-static void do_cmd_knowledge_home(player_type *player_ptr)
-{
-       process_dungeon_file(player_ptr, "w_info.txt", 0, 0, current_world_ptr->max_wild_y, current_world_ptr->max_wild_x);
-
-       FILE *fff = NULL;
-       GAME_TEXT file_name[FILE_NAME_SIZE];
-       if (!open_temporary_file(&fff, file_name)) return;
-
-       store_type *store_ptr;
-       store_ptr = &town_info[1].store[STORE_HOME];
-
-       if (store_ptr->stock_num)
-       {
-#ifdef JP
-               TERM_LEN x = 1;
-#endif
-               fprintf(fff, _("  [ 我が家のアイテム ]\n", "  [Home Inventory]\n"));
-               concptr paren = ")";
-               GAME_TEXT o_name[MAX_NLEN];
-               for (int i = 0; i < store_ptr->stock_num; i++)
-               {
-#ifdef JP
-                       if ((i % 12) == 0) fprintf(fff, "\n ( %d ページ )\n", x++);
-                       object_desc(player_ptr, o_name, &store_ptr->stock[i], 0);
-                       if (strlen(o_name) <= 80 - 3)
-                       {
-                               fprintf(fff, "%c%s %s\n", I2A(i % 12), paren, o_name);
-                       }
-                       else
-                       {
-                               int n;
-                               char *t;
-                               for (n = 0, t = o_name; n < 80 - 3; n++, t++)
-                                       if (iskanji(*t)) { t++; n++; }
-                               if (n == 81 - 3) n = 79 - 3; /* 最後が漢字半分 */
-
-                               fprintf(fff, "%c%s %.*s\n", I2A(i % 12), paren, n, o_name);
-                               fprintf(fff, "   %.77s\n", o_name + n);
-                       }
-#else
-                       object_desc(player_ptr, o_name, &store_ptr->stock[i], 0);
-                       fprintf(fff, "%c%s %s\n", I2A(i % 12), paren, o_name);
-#endif
-               }
-
-               fprintf(fff, "\n\n");
-       }
-
-       my_fclose(fff);
-       (void)show_file(player_ptr, TRUE, file_name, _("我が家のアイテム", "Home Inventory"), 0, 0);
-       fd_kill(file_name);
-}
-
-
-/*
  * Check the status of "autopick"
  */
 static void do_cmd_knowledge_autopick(player_type *creature_ptr)

diff --git a/src/knowledge/knowledge-self.c b/src/knowledge/knowledge-self.c
new file mode 100644 (file)
index 0000000..074c7ee
--- /dev/null
+++ b/src/knowledge/knowledge-self.c
@@ -0,0 +1,126 @@
+/*!
+ * @brief 自己に関する情報を表示する
+ * @date 2020/04/24
+ * @author Hourier
+ */
+
+#include "angband.h"
+#include "knowledge-self.h"
+#include "cmd/dump-util.h"
+#include "avatar.h"
+#include "birth.h"
+#include "core/show-file.h"
+#include "dungeon-file.h"
+#include "world.h"
+#include "market/store-util.h"
+#include "floor-town.h"
+#include "object-flavor.h"
+
+/*
+ * List virtues & status
+ */
+void do_cmd_knowledge_virtues(player_type *creature_ptr)
+{
+       FILE *fff = NULL;
+       GAME_TEXT file_name[FILE_NAME_SIZE];
+       if (!open_temporary_file(&fff, file_name)) return;
+
+       fprintf(fff, _("現在の属性 : %s\n\n", "Your alignment : %s\n\n"), your_alignment(creature_ptr));
+       dump_virtues(creature_ptr, fff);
+       my_fclose(fff);
+       (void)show_file(creature_ptr, TRUE, file_name, _("八つの徳", "Virtues"), 0, 0);
+       fd_kill(file_name);
+}
+
+
+/*
+* List virtues & status
+*
+*/
+void do_cmd_knowledge_stat(player_type *creature_ptr)
+{
+       FILE *fff = NULL;
+       GAME_TEXT file_name[FILE_NAME_SIZE];
+       if (!open_temporary_file(&fff, file_name)) return;
+
+       int percent = (int)(((long)creature_ptr->player_hp[PY_MAX_LEVEL - 1] * 200L) /
+               (2 * creature_ptr->hitdie +
+               ((PY_MAX_LEVEL - 1 + 3) * (creature_ptr->hitdie + 1))));
+
+       if (creature_ptr->knowledge & KNOW_HPRATE)
+               fprintf(fff, _("現在の体力ランク : %d/100\n\n", "Your current Life Rating is %d/100.\n\n"), percent);
+       else fprintf(fff, _("現在の体力ランク : ???\n\n", "Your current Life Rating is ???.\n\n"));
+
+       fprintf(fff, _("能力の最大値\n\n", "Limits of maximum stats\n\n"));
+       for (int v_nr = 0; v_nr < A_MAX; v_nr++)
+       {
+               if ((creature_ptr->knowledge & KNOW_STAT) || creature_ptr->stat_max[v_nr] == creature_ptr->stat_max_max[v_nr])
+                       fprintf(fff, "%s 18/%d\n", stat_names[v_nr], creature_ptr->stat_max_max[v_nr] - 18);
+               else
+                       fprintf(fff, "%s ???\n", stat_names[v_nr]);
+       }
+
+       dump_yourself(creature_ptr, fff);
+       my_fclose(fff);
+       (void)show_file(creature_ptr, TRUE, file_name, _("自分に関する情報", "HP-rate & Max stat"), 0, 0);
+       fd_kill(file_name);
+}
+
+
+/*
+ * List my home
+ * @param player_ptr プレーヤーへの参照ポインタ
+ * @return なし
+ */
+void do_cmd_knowledge_home(player_type *player_ptr)
+{
+       process_dungeon_file(player_ptr, "w_info.txt", 0, 0, current_world_ptr->max_wild_y, current_world_ptr->max_wild_x);
+
+       FILE *fff = NULL;
+       GAME_TEXT file_name[FILE_NAME_SIZE];
+       if (!open_temporary_file(&fff, file_name)) return;
+
+       store_type *store_ptr;
+       store_ptr = &town_info[1].store[STORE_HOME];
+
+       if (store_ptr->stock_num)
+       {
+#ifdef JP
+               TERM_LEN x = 1;
+#endif
+               fprintf(fff, _("  [ 我が家のアイテム ]\n", "  [Home Inventory]\n"));
+               concptr paren = ")";
+               GAME_TEXT o_name[MAX_NLEN];
+               for (int i = 0; i < store_ptr->stock_num; i++)
+               {
+#ifdef JP
+                       if ((i % 12) == 0) fprintf(fff, "\n ( %d ページ )\n", x++);
+                       object_desc(player_ptr, o_name, &store_ptr->stock[i], 0);
+                       if (strlen(o_name) <= 80 - 3)
+                       {
+                               fprintf(fff, "%c%s %s\n", I2A(i % 12), paren, o_name);
+                       }
+                       else
+                       {
+                               int n;
+                               char *t;
+                               for (n = 0, t = o_name; n < 80 - 3; n++, t++)
+                                       if (iskanji(*t)) { t++; n++; }
+                               if (n == 81 - 3) n = 79 - 3; /* 最後が漢字半分 */
+
+                               fprintf(fff, "%c%s %.*s\n", I2A(i % 12), paren, n, o_name);
+                               fprintf(fff, "   %.77s\n", o_name + n);
+                       }
+#else
+                       object_desc(player_ptr, o_name, &store_ptr->stock[i], 0);
+                       fprintf(fff, "%c%s %s\n", I2A(i % 12), paren, o_name);
+#endif
+               }
+
+               fprintf(fff, "\n\n");
+       }
+
+       my_fclose(fff);
+       (void)show_file(player_ptr, TRUE, file_name, _("我が家のアイテム", "Home Inventory"), 0, 0);
+       fd_kill(file_name);
+}

diff --git a/src/knowledge/knowledge-self.h b/src/knowledge/knowledge-self.h
new file mode 100644 (file)
index 0000000..6fe553d
--- /dev/null
+++ b/src/knowledge/knowledge-self.h
@@ -0,0 +1,5 @@
+#pragma once
+
+void do_cmd_knowledge_virtues(player_type *creature_ptr);
+void do_cmd_knowledge_stat(player_type *creature_ptr);
+void do_cmd_knowledge_home(player_type *player_ptr);