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

diff --git a/src/bldg.c b/src/bldg.c
index fdabccf..2cbabec 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -2194,7 +2194,7 @@ static bool inn_comm(player_type *customer_ptr, int cmd)
        }
        case BACT_RUMORS: /* Listen for rumors */
        {
-               display_rumor(TRUE);
+               display_rumor(customer_ptr, TRUE);
                break;
        }
        }

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index 2e8e736..da99fff 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -480,7 +480,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known)
                {
                        msg_print(_("巻物にはメッセージが書かれている:", "There is message on the scroll. It says:"));
                        msg_print(NULL);
-                       display_rumor(TRUE);
+                       display_rumor(creature_ptr, TRUE);
                        msg_print(NULL);
                        msg_print(_("巻物は煙を立てて消え去った！", "The scroll disappears in a puff of smoke!"));
 

diff --git a/src/rumor.c b/src/rumor.c
index 7b576c2..559f56a 100644 (file)
--- a/src/rumor.c
+++ b/src/rumor.c
@@ -38,7 +38,7 @@ concptr rumor_bind_name(char *base, concptr fullname)
        return v;
 }
 
-void display_rumor(bool ex)
+void display_rumor(player_type *player_ptr, bool ex)
 {
        errr err;
        int section = 0;
@@ -140,9 +140,9 @@ void display_rumor(bool ex)
                                strcpy(fullname, town_info[t_idx].name);
 
                                visit = (1L << (t_idx - 1));
-                               if ((t_idx != SECRET_TOWN) && !(p_ptr->visit & visit))
+                               if ((t_idx != SECRET_TOWN) && !(player_ptr->visit & visit))
                                {
-                                       p_ptr->visit |= visit;
+                                       player_ptr->visit |= visit;
                                        rumor_eff_format = _("%sに行ったことがある気がする。", "You feel you have been to %s.");
                                }
                        }

diff --git a/src/rumor.h b/src/rumor.h
index df56158..afbcfe3 100644 (file)
--- a/src/rumor.h
+++ b/src/rumor.h
@@ -1,3 +1,3 @@
 #pragma once
 
-extern void display_rumor(bool ex);
+extern void display_rumor(player_type *player_ptr, bool ex);

diff --git a/src/store.c b/src/store.c
index 995f22a..6be70cc 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -1635,9 +1635,10 @@ byte store_table[MAX_STORES][STORE_CHOICES][2] =
 /*!
  * @brief 取引成功時の店主のメッセージ処理 /
  * Successful haggle.
+ * @param player_ptr プレーヤーへの参照ポインタ
  * @return なし
  */
-static void say_comment_1(void)
+static void say_comment_1(player_type *player_ptr)
 {
 #ifdef JP
        /* ブラックマーケットのときは別のメッセージを出す */
@@ -1659,7 +1660,7 @@ static void say_comment_1(void)
 #else
                msg_print("The shopkeeper whispers something into your ear:");
 #endif
-               display_rumor(TRUE);
+               display_rumor(player_ptr, TRUE);
        }
 }
 
@@ -4706,7 +4707,7 @@ static void store_purchase(player_type *player_ptr)
                        if (player_ptr->au >= price)
                        {
                                /* Say "okay" */
-                               say_comment_1();
+                               say_comment_1(player_ptr);
 
                                if (cur_store_num == STORE_BLACK) /* The black market is illegal! */
                                        chg_virtue(player_ptr, V_JUSTICE, -1);
@@ -5018,7 +5019,7 @@ static void store_sell(player_type *owner_ptr)
                if (choice == 0)
                {
                        /* Say "okay" */
-                       say_comment_1();
+                       say_comment_1(owner_ptr);
 
                        /* Make a sound */
                        sound(SOUND_SELL);