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

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index d66925e..1497b5f 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -2580,7 +2580,7 @@ void do_cmd_visuals(player_type *creature_ptr)
                case 'R':
                case 'r':
                        /* Reset */
-                       reset_visuals();
+                       reset_visuals(creature_ptr);
 
                        msg_print(_("画面上の[色/文字]を初期値にリセットしました。", "Visual attr/char tables reset."));
                        need_redraw = TRUE;
@@ -3977,7 +3977,7 @@ void do_cmd_save_screen(player_type *creature_ptr)
        if (old_use_graphics)
        {
                use_graphics = FALSE;
-               reset_visuals();
+               reset_visuals(creature_ptr);
                creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
                handle_stuff(creature_ptr);
        }
@@ -4074,7 +4074,7 @@ void do_cmd_save_screen(player_type *creature_ptr)
        if (!old_use_graphics) return;
 
        use_graphics = TRUE;
-       reset_visuals();
+       reset_visuals(creature_ptr);
        creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
        handle_stuff(creature_ptr);
 }

diff --git a/src/core.c b/src/core.c
index 3a1d370..d6a5aa7 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -5249,7 +5249,7 @@ void play_game(player_type *player_ptr, bool new_game)
 
        if (browsing_movie)
        {
-               reset_visuals();
+               reset_visuals(player_ptr);
                browse_movie();
                return;
        }
@@ -5549,7 +5549,7 @@ void play_game(player_type *player_ptr, bool new_game)
        player_ptr->playing = TRUE;
 
        /* Reset the visual mappings */
-       reset_visuals();
+       reset_visuals(player_ptr);
 
        /* Load the "pref" files */
        load_all_pref_files(player_ptr);

diff --git a/src/main-win.c b/src/main-win.c
index 90f1fb0..606bfb2 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -2069,7 +2069,7 @@ static errr Term_xtra_win_react(void)
 
                /* Reset visuals */
 #ifdef ANGBAND_2_8_1
-               reset_visuals();
+               reset_visuals(p_ptr);
 #else /* ANGBAND_2_8_1 */
                reset_visuals(TRUE);
 #endif /* ANGBAND_2_8_1 */

diff --git a/src/object.h b/src/object.h
index a9bef5f..29346e5 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -392,7 +392,7 @@ extern OBJECT_TYPE_VALUE item_tester_tval;
 extern bool(*get_obj_num_hook)(KIND_OBJECT_IDX k_idx);
 
 /* object1.c */
-extern void reset_visuals(void);
+extern void reset_visuals(player_type *owner_ptr);
 extern void object_flags(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]);
 extern void object_flags_known(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]);
 extern concptr item_activation(object_type *o_ptr);

diff --git a/src/object1.c b/src/object1.c
index ef571e3..4d47b52 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -52,7 +52,7 @@
  *\n
  * The "prefs" parameter is no longer meaningful.  \n
  */
-void reset_visuals(void)
+void reset_visuals(player_type *owner_ptr)
 {
        int i, j;
 
@@ -94,13 +94,13 @@ void reset_visuals(void)
                char buf[1024];
 
                /* Process "graf.prf" */
-               process_pref_file(p_ptr, "graf.prf");
+               process_pref_file(owner_ptr, "graf.prf");
 
                /* Access the "character" pref file */
-               sprintf(buf, "graf-%s.prf", p_ptr->base_name);
+               sprintf(buf, "graf-%s.prf", owner_ptr->base_name);
 
                /* Process "graf-<playername>.prf" */
-               process_pref_file(p_ptr, buf);
+               process_pref_file(owner_ptr, buf);
        }
 
        /* Normal symbols */
@@ -109,13 +109,13 @@ void reset_visuals(void)
                char buf[1024];
 
                /* Process "font.prf" */
-               process_pref_file(p_ptr, "font.prf");
+               process_pref_file(owner_ptr, "font.prf");
 
                /* Access the "character" pref file */
-               sprintf(buf, "font-%s.prf", p_ptr->base_name);
+               sprintf(buf, "font-%s.prf", owner_ptr->base_name);
 
                /* Process "font-<playername>.prf" */
-               process_pref_file(p_ptr, buf);
+               process_pref_file(owner_ptr, buf);
        }
 }
 

diff --git a/src/report.c b/src/report.c
index 182f91b..9de6b1a 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -301,7 +301,7 @@ concptr make_screen_dump(player_type *creature_ptr)
                msg_print(NULL);
 
                use_graphics = FALSE;
-               reset_visuals();
+               reset_visuals(creature_ptr);
 
                creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
                handle_stuff(creature_ptr);
@@ -382,7 +382,7 @@ concptr make_screen_dump(player_type *creature_ptr)
        if (!old_use_graphics) return ret;
 
        use_graphics = TRUE;
-       reset_visuals();
+       reset_visuals(creature_ptr);
 
        creature_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_MAP | PR_EQUIPPY);
        handle_stuff(creature_ptr);