[Refactor] #38995 multi_rew を player_type の suppress_multi_reward へ改名して移動．

diff --git a/src/core.c b/src/core.c
index dbf3dab..356ebb8 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -1818,9 +1818,9 @@ static void process_world_aux_timeout(void)
                (void)set_tim_invis(p_ptr->tim_invis - 1, TRUE);
        }
 
-       if (multi_rew)
+       if (p_ptr->suppress_multi_reward)
        {
-               multi_rew = FALSE;
+               p_ptr->suppress_multi_reward = FALSE;
        }
 
        /* Timed esp */

diff --git a/src/externs.h b/src/externs.h
index 656c18a..4265c0c 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -65,7 +65,7 @@ extern MONSTER_IDX hack_m_idx;
 extern MONSTER_IDX hack_m_idx_ii;
 extern int total_friends;
 extern bool reinit_wilderness;
-extern bool multi_rew;
+
 extern bool reset_concent;
 
 

diff --git a/src/patron.c b/src/patron.c
index 31344d5..21a26d3 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -247,8 +247,8 @@ void gain_level_reward(int chosen_reward)
 
        if (!chosen_reward)
        {
-               if (multi_rew) return;
-               else multi_rew = TRUE;
+               if (p_ptr->suppress_multi_reward) return;
+               else p_ptr->suppress_multi_reward = TRUE;
        }
 
 

diff --git a/src/player-status.h b/src/player-status.h
index 694e2a3..1fbf696 100644 (file)
--- a/src/player-status.h
+++ b/src/player-status.h
@@ -463,6 +463,7 @@ struct player_type
        /*** Extracted fields ***/
 
        s16b running;                   /* Current counter for running, if any */
+       bool suppress_multi_reward; /*!< 複数レベルアップ時のパトロンからの報酬多重受け取りを防止 */
 
        WEIGHT total_weight;    /*!< 所持品と装備品の計算総重量 / Total weight being carried */
 

diff --git a/src/variable.c b/src/variable.c
index b97cd59..edc86ee 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -38,8 +38,6 @@ bool repair_objects;  /* Hack -- optimize detect objects */
 MONSTER_IDX hack_m_idx = 0;    /* Hack -- see "process_monsters()" */
 MONSTER_IDX hack_m_idx_ii = 0;
 
-bool multi_rew = FALSE;
-
 int total_friends = 0;
 
 bool reinit_wilderness = FALSE;