OSDN Git Service

[Refactor] #39964 Removed the dependency from read-pref-file to autopick-pref-processor
[hengband/hengband.git] / src / autopick / autopick-reader-writer.c
index c18102d..79875a3 100644 (file)
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "autopick/autopick-reader-writer.h"
 #include "autopick/autopick-initializer.h"
 #include "angband.h"
 #include "autopick/autopick-reader-writer.h"
 #include "autopick/autopick-initializer.h"
+#include "autopick/autopick-pref-processor.h"
 #include "files.h"
 #include "io/read-pref-file.h"
 
 #include "files.h"
 #include "io/read-pref-file.h"
 
@@ -12,7 +13,7 @@ void autopick_load_pref(player_type *player_ptr, bool disp_mes)
        GAME_TEXT buf[80];
        init_autopick();
        my_strcpy(buf, pickpref_filename(player_ptr, PT_WITH_PNAME), sizeof(buf));
        GAME_TEXT buf[80];
        init_autopick();
        my_strcpy(buf, pickpref_filename(player_ptr, PT_WITH_PNAME), sizeof(buf));
-       errr err = process_autopick_file(player_ptr, buf);
+       errr err = process_autopick_file(player_ptr, buf, process_autopick_file_command);
        if (err == 0 && disp_mes)
        {
                msg_format(_("%s\82ð\93Ç\82Ý\8d\9e\82Ý\82Ü\82µ\82½\81B", "Loaded '%s'."), buf);
        if (err == 0 && disp_mes)
        {
                msg_format(_("%s\82ð\93Ç\82Ý\8d\9e\82Ý\82Ü\82µ\82½\81B", "Loaded '%s'."), buf);
@@ -21,7 +22,7 @@ void autopick_load_pref(player_type *player_ptr, bool disp_mes)
        if (err < 0)
        {
                my_strcpy(buf, pickpref_filename(player_ptr, PT_DEFAULT), sizeof(buf));
        if (err < 0)
        {
                my_strcpy(buf, pickpref_filename(player_ptr, PT_DEFAULT), sizeof(buf));
-               err = process_autopick_file(player_ptr, buf);
+               err = process_autopick_file(player_ptr, buf, process_autopick_file_command);
                if (err == 0 && disp_mes)
                {
                        msg_format(_("%s\82ð\93Ç\82Ý\8d\9e\82Ý\82Ü\82µ\82½\81B", "Loaded '%s'."), buf);
                if (err == 0 && disp_mes)
                {
                        msg_format(_("%s\82ð\93Ç\82Ý\8d\9e\82Ý\82Ü\82µ\82½\81B", "Loaded '%s'."), buf);