[Refactor] #38997 dump_virtue() に player_type * 引数を追加．

diff --git a/src/avatar.c b/src/avatar.c
index 2b3a4c3..dd4d98b 100644 (file)
--- a/src/avatar.c
+++ b/src/avatar.c
@@ -485,7 +485,7 @@ void set_virtue(player_type *creature_ptr, int virtue_id, int amount)
  * @param OutFile ファイルポインタ。
  * @return なし
  */
-void dump_virtues(FILE *OutFile)
+void dump_virtues(player_type *creature_ptr, FILE *OutFile)
 {
        int v_nr = 0;
 
@@ -494,11 +494,11 @@ void dump_virtues(FILE *OutFile)
        for (v_nr = 0; v_nr < 8; v_nr++)
        {
                GAME_TEXT vir_name [20];
-               int tester = p_ptr->virtues[v_nr];
+               int tester = creature_ptr->virtues[v_nr];
 
-               strcpy(vir_name, virtue[(p_ptr->vir_types[v_nr])-1]);
+               strcpy(vir_name, virtue[(creature_ptr->vir_types[v_nr])-1]);
 
-               if (p_ptr->vir_types[v_nr] == 0 || p_ptr->vir_types[v_nr] > MAX_VIRTUE)
+               if (creature_ptr->vir_types[v_nr] == 0 || creature_ptr->vir_types[v_nr] > MAX_VIRTUE)
                        fprintf(OutFile, _("おっと。%sの情報なし。", "Oops. No info about %s."), vir_name);
 
                else if (tester < -100)

diff --git a/src/avatar.h b/src/avatar.h
index 4a1d698..567af8f 100644 (file)
--- a/src/avatar.h
+++ b/src/avatar.h
@@ -28,4 +28,4 @@ extern concptr virtue[MAX_VIRTUE];
 extern void get_virtues(player_type *creature_ptr);
 extern void chg_virtue(player_type *creature_ptr, int virtue, int amount);
 extern void set_virtue(player_type *creature_ptr, int virtue, int amount);
-extern void dump_virtues(FILE * OutFile);
+extern void dump_virtues(player_type *creature_ptr, FILE *OutFile);

diff --git a/src/cmd-dump.c b/src/cmd-dump.c
index 167bc02..711518a 100644 (file)
--- a/src/cmd-dump.c
+++ b/src/cmd-dump.c
@@ -6354,7 +6354,7 @@ static void do_cmd_knowledge_virtues(void)
        if (fff)
        {
                fprintf(fff, _("現在の属性 : %s\n\n", "Your alighnment : %s\n\n"), your_alignment());
-               dump_virtues(fff);
+               dump_virtues(p_ptr, fff);
        }
                my_fclose(fff);
        

diff --git a/src/files.c b/src/files.c
index 1d0a2c9..c76a065 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -4857,7 +4857,7 @@ static void dump_aux_virtues(FILE *fff)
 
        fprintf(fff, _("\n属性 : %s\n", "\nYour alighnment : %s\n"), your_alignment());
        fprintf(fff, "\n");
-       dump_virtues(fff);
+       dump_virtues(p_ptr, fff);
 }