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

diff --git a/src/bldg.c b/src/bldg.c
index af1499c..a30fa07 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -4259,13 +4259,14 @@ void do_cmd_bldg(player_type *player_ptr)
 
 /*!
  * @brief 今日の賞金首を確定する / Determine today's bounty monster
+ * @param player_type プレーヤーへの参照ポインタ
  * @return なし
  * @note conv_old is used if loaded 0.0.3 or older save file
  */
-void determine_today_mon(bool conv_old)
+void determine_today_mon(player_type *player_ptr, bool conv_old)
 {
        int max_dl = 3, i;
-       bool old_inside_battle = p_ptr->phase_out;
+       bool old_inside_battle = player_ptr->phase_out;
        monster_race *r_ptr;
 
        if (!conv_old)
@@ -4278,7 +4279,7 @@ void determine_today_mon(bool conv_old)
        }
        else max_dl = MAX(max_dlv[DUNGEON_ANGBAND], 3);
 
-       p_ptr->phase_out = TRUE;
+       player_ptr->phase_out = TRUE;
        get_mon_num_prep(NULL, NULL);
 
        while (1)
@@ -4295,8 +4296,8 @@ void determine_today_mon(bool conv_old)
                break;
        }
 
-       p_ptr->today_mon = 0;
-       p_ptr->phase_out = old_inside_battle;
+       player_ptr->today_mon = 0;
+       player_ptr->phase_out = old_inside_battle;
 }
 
 

diff --git a/src/bldg.h b/src/bldg.h
index 6bdf108..745c3d6 100644 (file)
--- a/src/bldg.h
+++ b/src/bldg.h
@@ -121,5 +121,5 @@ extern void update_gambling_monsters(player_type *player_ptr);
 extern void do_cmd_bldg(player_type *player_ptr);
 
 extern void clear_bldg(int min_row, int max_row);
-extern void determine_today_mon(bool conv_old);
+extern void determine_today_mon(player_type *player_ptr, bool conv_old);
 extern void determine_bounty_uniques(void);

diff --git a/src/core.c b/src/core.c
index 3018a60..81c48fd 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -3298,7 +3298,7 @@ static void process_world(player_type *player_ptr)
                if (min != prev_min)
                {
                        exe_write_diary(player_ptr, NIKKI_HIGAWARI, 0, NULL);
-                       determine_today_mon(FALSE);
+                       determine_today_mon(player_ptr, FALSE);
                }
        }
 
@@ -5414,7 +5414,7 @@ void play_game(player_type *player_ptr, bool new_game)
                load = FALSE;
 
                determine_bounty_uniques();
-               determine_today_mon(FALSE);
+               determine_today_mon(player_ptr, FALSE);
 
                /* Initialize object array */
                wipe_o_list(player_ptr->current_floor_ptr);

diff --git a/src/load.c b/src/load.c
index 654a45e..3af6717 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -2324,7 +2324,7 @@ static void rd_extra(player_type *creature_ptr)
 
        if (z_older_than(10,0,3))
        {
-               determine_today_mon(TRUE);
+               determine_today_mon(creature_ptr, TRUE);
        }
        else
        {