From 13649c00597ce48dd2fa1f396a6286ef72a838eb Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Tue, 24 Dec 2019 17:25:28 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20IS=5FFAST()=20=E3=81=AB=20?=
 =?utf8?q?player=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92=E8=BF=BD?=
 =?utf8?q?=E5=8A=A0=EF=BC=8E=20/=20Add=20player=5Ftype=20*=20argument=20to?=
 =?utf8?q?=20IS=5FFAST().?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/files.c           | 4 ++--
 src/mind.c            | 2 +-
 src/mspells1.c        | 2 +-
 src/player-effects.c  | 2 +-
 src/player-status.c   | 2 +-
 src/player-status.h   | 2 +-
 src/view-mainwindow.c | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/files.c b/src/files.c
index 505b3acbd..d3923089a 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1866,7 +1866,7 @@ static void display_player_middle(player_type *creature_ptr)
 
 		if (!creature_ptr->riding)
 		{
-			if (IS_FAST()) tmp_speed += 10;
+			if (IS_FAST(creature_ptr)) tmp_speed += 10;
 			if (creature_ptr->slow) tmp_speed -= 10;
 			if (creature_ptr->lightspeed) tmp_speed = 99;
 		}
@@ -2725,7 +2725,7 @@ static void tim_player_flags(player_type *creature_ptr, BIT_FLAGS flgs[TR_FLAG_S
 		add_flag(flgs, TR_REGEN);
 	if (IS_TIM_ESP())
 		add_flag(flgs, TR_TELEPATHY);
-	if (IS_FAST() || creature_ptr->slow)
+	if (IS_FAST(creature_ptr) || creature_ptr->slow)
 		add_flag(flgs, TR_SPEED);
 
 	if (IS_OPPOSE_ACID() && !(creature_ptr->special_defense & DEFENSE_ACID) && !(PRACE_IS_(creature_ptr, RACE_YEEK) && (creature_ptr->lev > 19)))
diff --git a/src/mind.c b/src/mind.c
index 109d153d2..5e58ba723 100644
--- a/src/mind.c
+++ b/src/mind.c
@@ -1135,7 +1135,7 @@ static bool cast_mindcrafter_spell(player_type *caster_ptr, int spell)
 		 * Only heal when Adrenalin Channeling is not active. We check
 		 * that by checking if the player isn't fast and 'heroed' atm.
 		 */
-		if (!IS_FAST() || !IS_HERO())
+		if (!IS_FAST(caster_ptr) || !IS_HERO())
 		{
 			hp_player(caster_ptr, plev);
 		}
diff --git a/src/mspells1.c b/src/mspells1.c
index 6a9145f33..40aeec422 100644
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -952,7 +952,7 @@ bool dispel_check(MONSTER_IDX m_idx)
 
 	if (p_ptr->pspeed < 145)
 	{
-		if (IS_FAST()) return (TRUE);
+		if (IS_FAST(p_ptr)) return (TRUE);
 	}
 
 	/* Light speed */
diff --git a/src/player-effects.c b/src/player-effects.c
index dcee62725..5b2e8fe2c 100644
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -776,7 +776,7 @@ bool set_fast(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 		{
 			if (creature_ptr->fast > v) return FALSE;
 		}
-		else if (!IS_FAST() && !creature_ptr->lightspeed)
+		else if (!IS_FAST(creature_ptr) && !creature_ptr->lightspeed)
 		{
 			msg_print(_("素早く動けるようになった！", "You feel yourself moving much faster!"));
 			notice = TRUE;
diff --git a/src/player-status.c b/src/player-status.c
index 4d6bc2288..21106fcfb 100644
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -2909,7 +2909,7 @@ void calc_bonuses(player_type *creature_ptr)
 	}
 
 	/* Temporary "fast" */
-	if (IS_FAST())
+	if (IS_FAST(creature_ptr))
 	{
 		new_speed += 10;
 	}
diff --git a/src/player-status.h b/src/player-status.h
index 9b8d1a97a..e43bc2e5c 100644
--- a/src/player-status.h
+++ b/src/player-status.h
@@ -800,7 +800,7 @@ extern const s32b player_exp_a[PY_MAX_LEVEL];
 
 
 /* Temporary flags macro */
-#define IS_FAST() (p_ptr->fast || music_singing(p_ptr, MUSIC_SPEED) || music_singing(p_ptr, MUSIC_SHERO))
+#define IS_FAST(C) (C->fast || music_singing(C, MUSIC_SPEED) || music_singing(C, MUSIC_SHERO))
 #define IS_INVULN() (p_ptr->invuln || music_singing(p_ptr, MUSIC_INVULN))
 #define IS_HERO() (p_ptr->hero || music_singing(p_ptr, MUSIC_HERO) || music_singing(p_ptr, MUSIC_SHERO))
 #define IS_BLESSED() (p_ptr->blessed || music_singing(p_ptr, MUSIC_BLESS) || hex_spelling(HEX_BLESS))
diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 97d73f5de..27150ffaa 100644
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -1172,7 +1172,7 @@ static void prt_state(void)
 static void prt_speed(void)
 {
 	int i = p_ptr->pspeed;
-	bool is_fast = IS_FAST();
+	bool is_fast = IS_FAST(p_ptr);
 
 	TERM_COLOR attr = TERM_WHITE;
 	char buf[32] = "";
-- 
2.11.0