From f5ed330cda6a1abac2b23b0f93bc80b718649ec8 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Sun, 22 Dec 2019 12:10:55 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20prt=5Fac(),=20prt=5Fhp(),?=
 =?utf8?q?=20prt=5Fsp()=20=E3=81=AB=20player=5Ftype=20*=20=E5=BC=95?=
 =?utf8?q?=E6=95=B0=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=8E=20/=20Add=20player?=
 =?utf8?q?=5Ftype=20*=20argument=20to=20prt=5Fac(),=20prt=5Fhp(),=20prt=5F?=
 =?utf8?q?sp().?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/view-mainwindow.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index ace07561c..0e4d665b9 100644
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -847,18 +847,18 @@ static void prt_gold(void)
  * @brief プレイヤーのACを表示する / Prints current AC
  * @return なし
  */
-static void prt_ac(void)
+static void prt_ac(player_type *creature_ptr)
 {
 	char tmp[32];
 
 #ifdef JP
 /* AC の表示方式を変更している */
 	put_str(" ＡＣ(     )", ROW_AC, COL_AC);
-	sprintf(tmp, "%5d", p_ptr->dis_ac + p_ptr->dis_to_a);
+	sprintf(tmp, "%5d", creature_ptr->dis_ac + creature_ptr->dis_to_a);
 	c_put_str(TERM_L_GREEN, tmp, ROW_AC, COL_AC + 6);
 #else
 	put_str("Cur AC ", ROW_AC, COL_AC);
-	sprintf(tmp, "%5d", p_ptr->dis_ac + p_ptr->dis_to_a);
+	sprintf(tmp, "%5d", creature_ptr->dis_ac + creature_ptr->dis_to_a);
 	c_put_str(TERM_L_GREEN, tmp, ROW_AC, COL_AC + 7);
 #endif
 
@@ -869,7 +869,7 @@ static void prt_ac(void)
  * @brief プレイヤーのHPを表示する / Prints Cur/Max hit points
  * @return なし
  */
-static void prt_hp(void)
+static void prt_hp(player_type *creature_ptr)
 {
 	/* ヒットポイントの表示方法を変更 */
 	char tmp[32];
@@ -880,13 +880,13 @@ static void prt_hp(void)
 	put_str("HP", ROW_CURHP, COL_CURHP);
 
 	/* 現在のヒットポイント */
-	sprintf(tmp, "%4ld", (long int)p_ptr->chp);
+	sprintf(tmp, "%4ld", (long int)creature_ptr->chp);
 
-	if (p_ptr->chp >= p_ptr->mhp)
+	if (creature_ptr->chp >= creature_ptr->mhp)
 	{
 		color = TERM_L_GREEN;
 	}
-	else if (p_ptr->chp > (p_ptr->mhp * hitpoint_warn) / 10)
+	else if (creature_ptr->chp > (creature_ptr->mhp * hitpoint_warn) / 10)
 	{
 		color = TERM_YELLOW;
 	}
@@ -901,7 +901,7 @@ static void prt_hp(void)
 	put_str( "/", ROW_CURHP, COL_CURHP + 7 );
 
 	/* 最大ヒットポイント */
-	sprintf(tmp, "%4ld", (long int)p_ptr->mhp);
+	sprintf(tmp, "%4ld", (long int)creature_ptr->mhp);
 	color = TERM_L_GREEN;
 
 	c_put_str(color, tmp, ROW_CURHP, COL_CURHP + 8 );
@@ -912,7 +912,7 @@ static void prt_hp(void)
  * @brief プレイヤーのMPを表示する / Prints players max/cur spell points
  * @return なし
  */
-static void prt_sp(void)
+static void prt_sp(player_type *creature_ptr)
 {
 /* マジックポイントの表示方法を変更している */
 	char tmp[32];
@@ -926,13 +926,13 @@ static void prt_sp(void)
 	put_str(_("MP", "SP"), ROW_CURSP, COL_CURSP);
 
 	/* 現在のマジックポイント */
-	sprintf(tmp, "%4ld", (long int)p_ptr->csp);
+	sprintf(tmp, "%4ld", (long int)creature_ptr->csp);
 
-	if (p_ptr->csp >= p_ptr->msp)
+	if (creature_ptr->csp >= creature_ptr->msp)
 	{
 		color = TERM_L_GREEN;
 	}
-	else if (p_ptr->csp > (p_ptr->msp * mana_warn) / 10)
+	else if (creature_ptr->csp > (creature_ptr->msp * mana_warn) / 10)
 	{
 		color = TERM_YELLOW;
 	}
@@ -947,7 +947,7 @@ static void prt_sp(void)
 	put_str( "/", ROW_CURSP, COL_CURSP + 7 );
 
 	/* 最大マジックポイント */
-	sprintf(tmp, "%4ld", (long int)p_ptr->msp);
+	sprintf(tmp, "%4ld", (long int)creature_ptr->msp);
 	color = TERM_L_GREEN;
 
 	c_put_str(color, tmp, ROW_CURSP, COL_CURSP + 8);
@@ -1524,9 +1524,9 @@ static void prt_frame_basic(void)
 	prt_level(p_ptr);
 	prt_exp(p_ptr);
 	for (i = 0; i < A_MAX; i++) prt_stat(p_ptr, i);
-	prt_ac();
-	prt_hp();
-	prt_sp();
+	prt_ac(p_ptr);
+	prt_hp(p_ptr);
+	prt_sp(p_ptr);
 	prt_gold();
 	prt_depth();
 	health_redraw(p_ptr, FALSE);
@@ -2162,19 +2162,19 @@ void redraw_stuff(void)
 	if (p_ptr->redraw & (PR_ARMOR))
 	{
 		p_ptr->redraw &= ~(PR_ARMOR);
-		prt_ac();
+		prt_ac(p_ptr);
 	}
 
 	if (p_ptr->redraw & (PR_HP))
 	{
 		p_ptr->redraw &= ~(PR_HP);
-		prt_hp();
+		prt_hp(p_ptr);
 	}
 
 	if (p_ptr->redraw & (PR_MANA))
 	{
 		p_ptr->redraw &= ~(PR_MANA);
-		prt_sp();
+		prt_sp(p_ptr);
 	}
 
 	if (p_ptr->redraw & (PR_GOLD))
-- 
2.11.0