[Refactor] #38997 autopick_load_pref() にplayer_type * 引数を追加/ Added player_type *...

diff --git a/src/autopick.c b/src/autopick.c
index d8da01a..f31ee21 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -761,7 +761,7 @@ static void init_autopick(void)
 /*
  *  Get file name for autopick preference
  */
-static concptr pickpref_filename(int filename_mode)
+static concptr pickpref_filename(player_type *player_ptr, int filename_mode)
 {
        static const char namebase[] = _("picktype", "pickpref");
 
@@ -771,7 +771,7 @@ static concptr pickpref_filename(int filename_mode)
                return format("%s.prf", namebase);
 
        case PT_WITH_PNAME:
-               return format("%s-%s.prf", namebase, p_ptr->base_name);
+               return format("%s-%s.prf", namebase, player_ptr->base_name);
 
        default:
                return NULL;
@@ -782,7 +782,7 @@ static concptr pickpref_filename(int filename_mode)
 /*
  * Load an autopick preference file
  */
-void autopick_load_pref(bool disp_mes)
+void autopick_load_pref(player_type *player_ptr, bool disp_mes)
 {
        GAME_TEXT buf[80];
        errr err;
@@ -791,7 +791,7 @@ void autopick_load_pref(bool disp_mes)
        init_autopick();
 
        /* Try a filename with player name */
-       my_strcpy(buf, pickpref_filename(PT_WITH_PNAME), sizeof(buf));
+       my_strcpy(buf, pickpref_filename(player_ptr, PT_WITH_PNAME), sizeof(buf));
 
        /* Load the file */
        err = process_autopick_file(buf);
@@ -806,7 +806,7 @@ void autopick_load_pref(bool disp_mes)
        if (0 > err)
        {
                /* Use default name */
-               my_strcpy(buf, pickpref_filename(PT_DEFAULT), sizeof(buf));
+               my_strcpy(buf, pickpref_filename(player_ptr, PT_DEFAULT), sizeof(buf));
 
                /* Load the file */
                err = process_autopick_file(buf);
@@ -1794,7 +1794,7 @@ static const char autoregister_header[] = "?:$AUTOREGISTER";
 /*
  *  Clear auto registered lines in the picktype.prf .
  */
-static bool clear_auto_register(void)
+static bool clear_auto_register(player_type *player_ptr)
 {
        char tmp_file[1024];
        char pref_file[1024];
@@ -1805,12 +1805,12 @@ static bool clear_auto_register(void)
        bool autoregister = FALSE;
        bool okay = TRUE;
 
-       path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(PT_WITH_PNAME));
+       path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(player_ptr, PT_WITH_PNAME));
        pref_fff = my_fopen(pref_file, "r");
 
        if (!pref_fff)
        {
-               path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(PT_DEFAULT));
+               path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(player_ptr, PT_DEFAULT));
                pref_fff = my_fopen(pref_file, "r");
        }
 
@@ -1953,17 +1953,17 @@ bool autopick_autoregister(player_type *player_ptr, object_type *o_ptr)
        if (!player_ptr->autopick_autoregister)
        {
                /* Clear old auto registered lines */
-               if (!clear_auto_register()) return FALSE;
+               if (!clear_auto_register(player_ptr)) return FALSE;
        }
 
        /* Try a filename with player name */
-       path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(PT_WITH_PNAME));
+       path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(player_ptr, PT_WITH_PNAME));
        pref_fff = my_fopen(pref_file, "r");
 
        if (!pref_fff)
        {
                /* Use default name */
-               path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(PT_DEFAULT));
+               path_build(pref_file, sizeof(pref_file), ANGBAND_DIR_USER, pickpref_filename(player_ptr, PT_DEFAULT));
                pref_fff = my_fopen(pref_file, "r");
        }
 
@@ -2783,7 +2783,7 @@ static concptr *read_text_lines(concptr filename)
 /*
  * Copy the default autopick file to the user directory
  */
-static void prepare_default_pickpref(void)
+static void prepare_default_pickpref(player_type *player_ptr)
 {
        const concptr messages[] = {
                _("あなたは「自動拾いエディタ」を初めて起動しました。", "You have activated the Auto-Picker Editor for the first time."),
@@ -2796,7 +2796,7 @@ static void prepare_default_pickpref(void)
        FILE *pref_fp;
        FILE *user_fp;
        int i;
-       concptr filename = pickpref_filename(PT_DEFAULT);
+       concptr filename = pickpref_filename(player_ptr, PT_DEFAULT);
 
        /* Display messages */
        for (i = 0; messages[i]; i++) msg_print(messages[i]);
@@ -2842,21 +2842,21 @@ static void prepare_default_pickpref(void)
  * Read an autopick prefence file to memory
  * Prepare default if no user file is found
  */
-static concptr *read_pickpref_text_lines(int *filename_mode_p)
+static concptr *read_pickpref_text_lines(player_type *player_ptr, int *filename_mode_p)
 {
        char buf[1024];
        concptr *lines_list;
 
        /* Try a filename with player name */
        *filename_mode_p = PT_WITH_PNAME;
-       strcpy(buf, pickpref_filename(*filename_mode_p));
+       strcpy(buf, pickpref_filename(player_ptr, *filename_mode_p));
        lines_list = read_text_lines(buf);
 
        if (!lines_list)
        {
                /* Use default name */
                *filename_mode_p = PT_DEFAULT;
-               strcpy(buf, pickpref_filename(*filename_mode_p));
+               strcpy(buf, pickpref_filename(player_ptr, *filename_mode_p));
                lines_list = read_text_lines(buf);
        }
 
@@ -2865,7 +2865,7 @@ static concptr *read_pickpref_text_lines(int *filename_mode_p)
                /* There is no preference file in the user directory */
 
                /* Copy the default autopick file to the user directory */
-               prepare_default_pickpref();
+               prepare_default_pickpref(player_ptr);
 
                /* Use default name again */
                lines_list = read_text_lines(buf);
@@ -4970,7 +4970,7 @@ static bool do_editor_command(player_type *player_ptr, text_body_type *tb, int c
                                                 "Discard all changes and revert to original file. Are you sure? "))) break;
 
                free_text_lines(tb->lines_list);
-               tb->lines_list = read_pickpref_text_lines(&tb->filename_mode);
+               tb->lines_list = read_pickpref_text_lines(player_ptr, &tb->filename_mode);
                tb->dirty_flags |= DIRTY_ALL | DIRTY_MODE | DIRTY_EXPRESSION;
                tb->cx = tb->cy = 0;
                tb->mark = 0;
@@ -6028,7 +6028,7 @@ void do_cmd_edit_autopick(player_type *player_ptr)
        }
 
        /* Read or initialize whole text */
-       tb->lines_list = read_pickpref_text_lines(&tb->filename_mode);
+       tb->lines_list = read_pickpref_text_lines(player_ptr, &tb->filename_mode);
 
        /* Reset cursor position if needed */
        for (i = 0; i < tb->cy; i++)
@@ -6124,7 +6124,7 @@ void do_cmd_edit_autopick(player_type *player_ptr)
        screen_load();
 
        /* Get the filename of preference */
-       strcpy(buf, pickpref_filename(tb->filename_mode));
+       strcpy(buf, pickpref_filename(player_ptr, tb->filename_mode));
 
        if (quit == QUIT_AND_SAVE)
                write_text_lines(buf, tb->lines_list);

diff --git a/src/autopick.h b/src/autopick.h
index 94bd37a..8db0557 100644 (file)
--- a/src/autopick.h
+++ b/src/autopick.h
@@ -27,8 +27,7 @@ extern int max_autopick;
 extern int max_max_autopick;
 extern autopick_type *autopick_list;
 
-/* autopick.c */
-extern void autopick_load_pref(bool disp_mes);
+extern void autopick_load_pref(player_type *player_ptr, bool disp_mes);
 extern errr process_autopick_file_command(char *buf);
 extern concptr autopick_line_from_entry(autopick_type *entry);
 extern int is_autopick(object_type *o_ptr);

diff --git a/src/birth.c b/src/birth.c
index bcefdcb..c1b6240 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -4445,7 +4445,7 @@ static bool player_birth_aux(player_type *creature_ptr)
        get_name(creature_ptr);
 
        /* Process the player name */
-       process_player_name(current_world_ptr->creating_savefile);
+       process_player_name(creature_ptr, current_world_ptr->creating_savefile);
 
        /*** Edit character background ***/
        edit_history(creature_ptr);
@@ -4548,7 +4548,7 @@ static bool ask_quick_start(player_type *creature_ptr)
        creature_ptr->csp = creature_ptr->msp;
 
        /* Process the player name */
-       process_player_name(FALSE);
+       process_player_name(creature_ptr, FALSE);
 
        return TRUE;
 }

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index 144ecb0..2a5c35b 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -1073,7 +1073,7 @@ void do_cmd_player_status(player_type *creature_ptr)
                        get_name(creature_ptr);
 
                        /* Process the player name */
-                       process_player_name(FALSE);
+                       process_player_name(creature_ptr, FALSE);
                }
 
                /* File dump */
@@ -1369,13 +1369,14 @@ void do_cmd_pref(void)
 
 /*!
  * @brief 自動拾い設定ファイルをロードするコマンドのメインルーチン /
+ * @param creature_ptr プレーヤーへの参照ポインタ
  * @return なし
  */
-void do_cmd_reload_autopick(void)
+void do_cmd_reload_autopick(player_type *creature_ptr)
 {
        if (!get_check(_("自動拾い設定ファイルをロードしますか? ", "Reload auto-pick preference file? "))) return;
        /* Load the file with messages */
-       autopick_load_pref(TRUE);
+       autopick_load_pref(creature_ptr, TRUE);
 }
 
 #ifdef ALLOW_MACROS

diff --git a/src/cmd/cmd-dump.h b/src/cmd/cmd-dump.h
index a10ae9e..d54f934 100644 (file)
--- a/src/cmd/cmd-dump.h
+++ b/src/cmd/cmd-dump.h
@@ -55,7 +55,7 @@ extern void do_cmd_player_status(player_type *creature_ptr);
 extern void do_cmd_message_one(void);
 extern void do_cmd_messages(int num_now);
 extern void do_cmd_pref(void);
-extern void do_cmd_reload_autopick(void);
+extern void do_cmd_reload_autopick(player_type *creature_ptr);
 extern void do_cmd_macros(player_type *creature_ptr);
 extern void do_cmd_visuals(player_type *creature_ptr);
 extern void do_cmd_colors(player_type *creature_ptr);

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index a4bb69c..158dc7f 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -745,6 +745,7 @@ void do_cmd_browse(player_type *caster_ptr)
 
 /*!
  * @brief プレイヤーの第二魔法領域を変更する /
+ * @param caster_ptr プレーヤーへの参照ポインタ
  * @param next_realm 変更先の魔法領域ID
  * @return なし
  */
@@ -779,7 +780,7 @@ static void change_realm2(player_type *caster_ptr, CHARACTER_IDX next_realm)
        handle_stuff(caster_ptr);
 
        /* Load an autopick preference file */
-       autopick_load_pref(FALSE);
+       autopick_load_pref(caster_ptr, FALSE);
 }
 
 

diff --git a/src/core.c b/src/core.c
index 089fd49..1563f5a 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -4101,7 +4101,7 @@ static void process_command(player_type *creature_ptr)
 
                case '$':
                {
-                       do_cmd_reload_autopick();
+                       do_cmd_reload_autopick(creature_ptr);
                        break;
                }
 
@@ -5158,12 +5158,13 @@ static void dungeon(player_type *player_ptr, bool load_game)
 
 /*!
  * @brief 全ユーザプロファイルをロードする / Load some "user pref files"
+ * @paaram player_ptr プレーヤーへの参照ポインタ
  * @return なし
  * @note
  * Modified by Arcum Dagsson to support
  * separate macro files for different realms.
  */
-static void load_all_pref_files(void)
+static void load_all_pref_files(player_type *player_ptr)
 {
        char buf[1024];
 
@@ -5217,7 +5218,7 @@ static void load_all_pref_files(void)
 
 
        /* Load an autopick preference file */
-       autopick_load_pref(FALSE);
+       autopick_load_pref(player_ptr, FALSE);
 }
 
 
@@ -5374,7 +5375,7 @@ void play_game(player_type *player_ptr, bool new_game)
        if (!new_game)
        {
                /* Process the player name */
-               process_player_name(FALSE);
+               process_player_name(player_ptr, FALSE);
        }
 
        /* Init the RNG */
@@ -5556,7 +5557,7 @@ void play_game(player_type *player_ptr, bool new_game)
        reset_visuals();
 
        /* Load the "pref" files */
-       load_all_pref_files();
+       load_all_pref_files(player_ptr);
 
        /* Give startup outfit (after loading pref files) */
        if (new_game)

diff --git a/src/files.c b/src/files.c
index c600abb..d4a3190 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -5757,13 +5757,14 @@ void do_cmd_help(void)
 /*!
  * @brief プレイヤーの名前をチェックして修正する
  * Process the player name.
+ * @param player_ptr プレーヤーへの参照ポインタ
  * @param sf セーブファイル名に合わせた修正を行うならばTRUE
  * @return なし
  * @details
  * Extract a clean "base name".
  * Build the savefile name if needed.
  */
-void process_player_name(bool sf)
+void process_player_name(player_type *creature_ptr, bool sf)
 {
        int i, k = 0;
        char old_player_base[32] = "";
@@ -5905,7 +5906,7 @@ void process_player_name(bool sf)
        /* Load an autopick preference file */
        if (current_world_ptr->character_generated)
        {
-               if (!streq(old_player_base, p_ptr->base_name)) autopick_load_pref(FALSE);
+               if (!streq(old_player_base, p_ptr->base_name)) autopick_load_pref(creature_ptr, FALSE);
        }
 }
 

diff --git a/src/files.h b/src/files.h
index 452a14f..490c873 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -41,7 +41,7 @@ extern errr check_time(void);
 extern errr check_load(void);
 extern bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode);
 extern void do_cmd_help(void);
-extern void process_player_name(bool sf);
+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);
 extern void do_cmd_save_and_exit(void);

diff --git a/src/player-effects.c b/src/player-effects.c
index 6d97162..c848b23 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -3674,7 +3674,7 @@ void change_race(player_type *creature_ptr, CHARACTER_IDX new_race, concptr effe
        handle_stuff(creature_ptr);
 
        /* Load an autopick preference file */
-       if (old_race != creature_ptr->prace) autopick_load_pref(FALSE);
+       if (old_race != creature_ptr->prace) autopick_load_pref(creature_ptr, FALSE);
 
        /* Player's graphic tile may change */
        lite_spot(creature_ptr->y, creature_ptr->x);

diff --git a/src/player-status.c b/src/player-status.c
index 8665cec..2dae77f 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -5653,7 +5653,7 @@ void check_experience(player_type *creature_ptr)
        }
 
        /* Load an autopick preference file */
-       if (old_lev != creature_ptr->lev) autopick_load_pref(FALSE);
+       if (old_lev != creature_ptr->lev) autopick_load_pref(creature_ptr, FALSE);
 }
 
 /*!