<ClCompile Include="..\..\src\birth.c" />\r
<ClCompile Include="..\..\src\cmd\cmd-process-screen.c" />\r
<ClCompile Include="..\..\src\cmd\dump-util.c" />\r
+ <ClCompile Include="..\..\src\knowledge\knowledge-autopick.c" />\r
<ClCompile Include="..\..\src\knowledge\knowledge-features.c" />\r
<ClCompile Include="..\..\src\knowledge\knowledge-items.c" />\r
<ClCompile Include="..\..\src\knowledge\knowledge-experiences.c" />\r
<ClInclude Include="..\..\src\birth.h" />\r
<ClInclude Include="..\..\src\cmd\cmd-process-screen.h" />\r
<ClInclude Include="..\..\src\cmd\dump-util.h" />\r
+ <ClInclude Include="..\..\src\knowledge\knowledge-autopick.h" />\r
<ClInclude Include="..\..\src\knowledge\knowledge-features.h" />\r
<ClInclude Include="..\..\src\knowledge\knowledge-items.h" />\r
<ClInclude Include="..\..\src\knowledge\knowledge-experiences.h" />\r
<ClCompile Include="..\..\src\knowledge\knowledge-features.c">
<Filter>knowledge</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\knowledge\knowledge-autopick.c">
+ <Filter>knowledge</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\gamevalue.h" />
<ClInclude Include="..\..\src\knowledge\knowledge-features.h">
<Filter>knowledge</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\knowledge\knowledge-autopick.h">
+ <Filter>knowledge</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\wall.bmp" />
z-form.c z-form.h z-rand.c z-rand.h z-term.c z-term.h z-util.c z-util.h \
z-virt.c z-virt.h \
\
- knowledge/knowledge-items.c knowledge/knowledge-items.h \
+ knowledge/knowledge-autopick.c knowledge/knowledge-autopick.h \
knowledge/knowledge-experiences.c knowledge/knowledge-experiences.h \
knowledge/knowledge-features.c knowledge/knowledge-features.h \
+ knowledge/knowledge-items.c knowledge/knowledge-items.h \
knowledge/knowledge-monsters.c knowledge/knowledge-monsters.h \
knowledge/knowledge-uniques.c knowledge/knowledge-uniques.h \
knowledge/knowledge-self.c knowledge/knowledge-self.h \
#include "cmd/cmd-draw.h"
#include "cmd/cmd-dump.h"
#include "cmd/cmd-inventory.h"
-#include "cmd/lighting-level-table.h"
#include "cmd/cmd-visuals.h"
#include "cmd/dump-util.h"
#include "gameterm.h"
#include "core.h" // 暫定。後で消す.
-#include "core/show-file.h"
#include "io/read-pref-file.h"
#include "io/interpret-pref-file.h"
-#include "knowledge/knowledge-items.h"
+#include "knowledge/knowledge-autopick.h"
#include "knowledge/knowledge-experiences.h"
#include "knowledge/knowledge-features.h"
+#include "knowledge/knowledge-items.h"
#include "knowledge/knowledge-monsters.h"
#include "knowledge/knowledge-quests.h"
#include "knowledge/knowledge-self.h"
#include "knowledge/knowledge-uniques.h"
-#include "autopick.h"
-#include "dungeon.h"
#include "world.h"
#include "view/display-player.h" // 暫定。後で消す.
#include "player-personality.h"
-#include "sort.h"
#include "mutation.h"
#include "quest.h"
#include "market/store.h"
#include "artifact.h"
-#include "object-flavor.h"
-#include "object/object-kind.h"
#include "floor-town.h"
#include "cmd/feeling-table.h"
-#include "cmd/object-group-table.h"
#include "market/store-util.h"
-#include "view-mainwindow.h" // 暫定。後で消す
#include "english.h"
-#include "diary-subtitle-table.h"
-#include "io/write-diary.h"
#include "chuukei.h"
/*!
}
-/*!
- * @brief 自動拾い設定ファイルをロードするコマンドのメインルーチン /
- * @param creature_ptr プレーヤーへの参照ポインタ
- * @return なし
- */
-void do_cmd_reload_autopick(player_type *creature_ptr)
-{
- if (!get_check(_("自動拾い設定ファイルをロードしますか? ", "Reload auto-pick preference file? ")))
- return;
-
- autopick_load_pref(creature_ptr, TRUE);
-}
-
-
/*
* Interact with "colors"
*/
/*
- * Check the status of "autopick"
- */
-static void do_cmd_knowledge_autopick(player_type *creature_ptr)
-{
- FILE *fff = NULL;
- GAME_TEXT file_name[FILE_NAME_SIZE];
- if (!open_temporary_file(&fff, file_name)) return;
-
- if (!max_autopick)
- {
- fprintf(fff, _("自動破壊/拾いには何も登録されていません。", "No preference for auto picker/destroyer."));
- }
- else
- {
- fprintf(fff, _(" 自動拾い/破壊には現在 %d行登録されています。\n\n",
- " There are %d registered lines for auto picker/destroyer.\n\n"), max_autopick);
- }
-
- for (int k = 0; k < max_autopick; k++)
- {
- concptr tmp;
- byte act = autopick_list[k].action;
- if (act & DONT_AUTOPICK)
- {
- tmp = _("放置", "Leave");
- }
- else if (act & DO_AUTODESTROY)
- {
- tmp = _("破壊", "Destroy");
- }
- else if (act & DO_AUTOPICK)
- {
- tmp = _("拾う", "Pickup");
- }
- else
- {
- tmp = _("確認", "Query");
- }
-
- if (act & DO_DISPLAY)
- fprintf(fff, "%11s", format("[%s]", tmp));
- else
- fprintf(fff, "%11s", format("(%s)", tmp));
-
- tmp = autopick_line_from_entry(&autopick_list[k]);
- fprintf(fff, " %s", tmp);
- string_free(tmp);
- fprintf(fff, "\n");
- }
-
- my_fclose(fff);
-
- (void)show_file(creature_ptr, TRUE, file_name, _("自動拾い/破壊 設定リスト", "Auto-picker/Destroyer"), 0, 0);
- fd_kill(file_name);
-}
-
-
-/*
* Interact with "knowledge"
*/
void do_cmd_knowledge(player_type *creature_ptr)
#pragma once
extern void do_cmd_pref(player_type *creature_ptr);
-extern void do_cmd_reload_autopick(player_type *creature_ptr);
extern void do_cmd_colors(player_type *creature_ptr);
extern void do_cmd_note(void);
extern void do_cmd_version(void);
#include "object-ego.h"
#include "object-curse.h"
#include "object-flavor.h"
+#include "knowledge/knowledge-autopick.h"
#include "market/store.h"
#include "spells.h"
#include "spells-summon.h"
--- /dev/null
+/*!
+ * @brief 自動拾いの登録状況を表示する
+ * @date 2020/04/23
+ * @author Hourier
+ */
+
+#include "angband.h"
+#include "knowledge-autopick.h"
+#include "cmd/dump-util.h"
+#include "core/show-file.h"
+#include "autopick.h"
+
+ /*!
+ * @brief 自動拾い設定ファイルをロードするコマンドのメインルーチン /
+ * @param creature_ptr プレーヤーへの参照ポインタ
+ * @return なし
+ */
+void do_cmd_reload_autopick(player_type *creature_ptr)
+{
+ if (!get_check(_("自動拾い設定ファイルをロードしますか? ", "Reload auto-pick preference file? ")))
+ return;
+
+ autopick_load_pref(creature_ptr, TRUE);
+}
+
+
+/*
+ * Check the status of "autopick"
+ */
+void do_cmd_knowledge_autopick(player_type *creature_ptr)
+{
+ FILE *fff = NULL;
+ GAME_TEXT file_name[FILE_NAME_SIZE];
+ if (!open_temporary_file(&fff, file_name)) return;
+
+ if (!max_autopick)
+ {
+ fprintf(fff, _("自動破壊/拾いには何も登録されていません。", "No preference for auto picker/destroyer."));
+ }
+ else
+ {
+ fprintf(fff, _(" 自動拾い/破壊には現在 %d行登録されています。\n\n",
+ " There are %d registered lines for auto picker/destroyer.\n\n"), max_autopick);
+ }
+
+ for (int k = 0; k < max_autopick; k++)
+ {
+ concptr tmp;
+ byte act = autopick_list[k].action;
+ if (act & DONT_AUTOPICK)
+ {
+ tmp = _("放置", "Leave");
+ }
+ else if (act & DO_AUTODESTROY)
+ {
+ tmp = _("破壊", "Destroy");
+ }
+ else if (act & DO_AUTOPICK)
+ {
+ tmp = _("拾う", "Pickup");
+ }
+ else
+ {
+ tmp = _("確認", "Query");
+ }
+
+ if (act & DO_DISPLAY)
+ fprintf(fff, "%11s", format("[%s]", tmp));
+ else
+ fprintf(fff, "%11s", format("(%s)", tmp));
+
+ tmp = autopick_line_from_entry(&autopick_list[k]);
+ fprintf(fff, " %s", tmp);
+ string_free(tmp);
+ fprintf(fff, "\n");
+ }
+
+ my_fclose(fff);
+
+ (void)show_file(creature_ptr, TRUE, file_name, _("自動拾い/破壊 設定リスト", "Auto-picker/Destroyer"), 0, 0);
+ fd_kill(file_name);
+}
--- /dev/null
+#pragma once
+
+void do_cmd_reload_autopick(player_type *creature_ptr);
+void do_cmd_knowledge_autopick(player_type *creature_ptr);