From 8f4663f8167a874db446406ad832a53764e42095 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Mon, 26 Aug 2019 22:58:44 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20racial=5Faux()=20=E3=81=AB?=
 =?utf8?q?=20player=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?=20racial=5Faux().?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/racial.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/racial.c b/src/racial.c
index 2886aa037..e715754f4 100644
--- a/src/racial.c
+++ b/src/racial.c
@@ -306,7 +306,7 @@ static int racial_cost;
  * 発動成功ならば1、発動失敗ならば-1、キャンセルならば0を返す。
  * return value indicates that we have succesfully used the power 1: Succeeded, 0: Cancelled, -1: Failed
  */
-static int racial_aux(power_desc_type *pd_ptr)
+static int racial_aux(player_type *caster_ptr, power_desc_type *pd_ptr)
 {
 	PLAYER_LEVEL min_level  = pd_ptr->level;
 	int use_stat   = pd_ptr->stat;
@@ -316,30 +316,30 @@ static int racial_aux(power_desc_type *pd_ptr)
 	racial_cost = pd_ptr->cost;
 
 	/* Not enough mana - use hp */
-	if (p_ptr->csp < racial_cost) use_hp = racial_cost - p_ptr->csp;
+	if (caster_ptr->csp < racial_cost) use_hp = racial_cost - caster_ptr->csp;
 
 	/* Power is not available yet */
-	if (p_ptr->lev < min_level)
+	if (caster_ptr->lev < min_level)
 	{
 		msg_format(_("この能力を使用するにはレベル %d に達していなければなりません。", 
 					 "You need to attain level %d to use this power."), min_level);
 
-		free_turn(p_ptr);
+		free_turn(caster_ptr);
 		return FALSE;
 	}
 
-	if (cmd_limit_confused(p_ptr))
+	if (cmd_limit_confused(caster_ptr))
 	{
-		free_turn(p_ptr);
+		free_turn(caster_ptr);
 		return FALSE;
 	}
 
 	/* Risk death? */
-	else if (p_ptr->chp < use_hp)
+	else if (caster_ptr->chp < use_hp)
 	{
 		if (!get_check(_("本当に今の衰弱した状態でこの能力を使いますか？", "Really use the power in your weakened state? ")))
 		{
-			free_turn(p_ptr);
+			free_turn(caster_ptr);
 			return FALSE;
 		}
 	}
@@ -348,13 +348,13 @@ static int racial_aux(power_desc_type *pd_ptr)
 
 	if (difficulty)
 	{
-		if (p_ptr->stun)
+		if (caster_ptr->stun)
 		{
-			difficulty += p_ptr->stun;
+			difficulty += caster_ptr->stun;
 		}
-		else if (p_ptr->lev > min_level)
+		else if (caster_ptr->lev > min_level)
 		{
-			int lev_adj = ((p_ptr->lev - min_level) / 3);
+			int lev_adj = ((caster_ptr->lev - min_level) / 3);
 			if (lev_adj > 10) lev_adj = 10;
 			difficulty -= lev_adj;
 		}
@@ -363,10 +363,10 @@ static int racial_aux(power_desc_type *pd_ptr)
 	}
 
 	/* take time and pay the price */
-	take_turn(p_ptr, 100);
+	take_turn(caster_ptr, 100);
 
 	/* Success? */
-	if (randint1(p_ptr->stat_cur[use_stat]) >= ((difficulty / 2) + randint1(difficulty / 2)))
+	if (randint1(caster_ptr->stat_cur[use_stat]) >= ((difficulty / 2) + randint1(difficulty / 2)))
 	{
 		return 1;
 	}
@@ -1995,7 +1995,7 @@ void do_cmd_racial_power(player_type *creature_ptr)
 		}
 		repeat_push(i);
 	} /*if (!repeat_pull(&i) || ...)*/
-	switch (racial_aux(&power_desc[i]))
+	switch (racial_aux(creature_ptr, &power_desc[i]))
 	{
 	case 1:
 		if (power_desc[i].number < 0)
-- 
2.11.0