From 02620d2859225de3b03397f7964cf1a8c37c0000 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Thu, 16 May 2019 00:07:01 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#38995=20multi=5Frew=20=E3=82=92=20?=
 =?utf8?q?player=5Ftype=20=E3=81=AE=E3=80=80suppress=5Fmulti=5Freward=20?=
 =?utf8?q?=E3=81=B8=E6=94=B9=E5=90=8D=E3=81=97=E3=81=A6=E7=A7=BB=E5=8B=95?=
 =?utf8?q?=EF=BC=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/core.c          | 4 ++--
 src/externs.h       | 2 +-
 src/patron.c        | 4 ++--
 src/player-status.h | 1 +
 src/variable.c      | 2 --
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/core.c b/src/core.c
index dbf3dab66..356ebb806 100644
--- 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 656c18a5e..4265c0c51 100644
--- 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 31344d5f7..21a26d3df 100644
--- 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 694e2a349..1fbf696e2 100644
--- 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 b97cd59df..edc86eef6 100644
--- 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;
-- 
2.11.0