From 5662df92cc7e09b874c8b9027f6a28d684f34939 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Sat, 31 Aug 2019 18:50:34 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20cmd-basic.c=20=E3=81=AE?=
 =?utf8?q?=E5=A4=89=E6=95=B0=E5=8F=82=E7=85=A7=E3=82=92=E5=86=8D=E6=95=B4?=
 =?utf8?q?=E7=90=86.=20/=20Refactor=20variable=20reference=20in=20cmd-basi?=
 =?utf8?q?c.c.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd/cmd-basic.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index d44bcd972..67b91c232 100644
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -900,7 +900,7 @@ void do_cmd_open(player_type *creature_ptr)
 	}
 
 	/* Cancel repeat unless we may continue */
-	if (!more) disturb(p_ptr, FALSE, FALSE);
+	if (!more) disturb(creature_ptr, FALSE, FALSE);
 }
 
 
@@ -1038,7 +1038,7 @@ void do_cmd_close(player_type *creature_ptr)
 	}
 
 	/* Cancel repeat unless we may continue */
-	if (!more) disturb(p_ptr, FALSE, FALSE);
+	if (!more) disturb(creature_ptr, FALSE, FALSE);
 }
 
 
@@ -1277,7 +1277,7 @@ void do_cmd_tunnel(player_type *creature_ptr)
 	}
 
 	/* Cancel repetition unless we can continue */
-	if (!more) disturb(p_ptr, FALSE, FALSE);
+	if (!more) disturb(creature_ptr, FALSE, FALSE);
 }
 
 /*!
@@ -1631,7 +1631,7 @@ void do_cmd_disarm(player_type *creature_ptr)
 	}
 
 	/* Cancel repeat unless told not to */
-	if (!more) disturb(p_ptr, FALSE, FALSE);
+	if (!more) disturb(creature_ptr, FALSE, FALSE);
 }
 
 
@@ -1807,7 +1807,7 @@ void do_cmd_bash(player_type *creature_ptr)
 	}
 
 	/* Unless valid action taken, cancel bash */
-	if (!more) disturb(p_ptr, FALSE, FALSE);
+	if (!more) disturb(creature_ptr, FALSE, FALSE);
 }
 
 
@@ -1908,7 +1908,7 @@ void do_cmd_alter(player_type *creature_ptr)
 	}
 
 	/* Cancel repetition unless we can continue */
-	if (!more) disturb(p_ptr, FALSE, FALSE);
+	if (!more) disturb(creature_ptr, FALSE, FALSE);
 }
 
 
@@ -2092,7 +2092,7 @@ void do_cmd_walk(player_type *creature_ptr, bool pickup)
 	}
 
 	/* Cancel repeat unless we may continue */
-	if (!more) disturb(p_ptr, FALSE, FALSE);
+	if (!more) disturb(creature_ptr, FALSE, FALSE);
 }
 
 
@@ -2287,7 +2287,7 @@ void do_cmd_fire(player_type *creature_ptr, SPELL_IDX snipe_type)
 	q = _("どれを撃ちますか? ", "Fire which item? ");
 	s = _("発射されるアイテムがありません。", "You have nothing to fire.");
 
-	ammo_ptr = choose_object(p_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), creature_ptr->tval_ammo);
+	ammo_ptr = choose_object(creature_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), creature_ptr->tval_ammo);
 	if (!ammo_ptr)
 	{
 		flush();
@@ -2378,7 +2378,7 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID
 			item_tester_hook = item_tester_hook_boomerang;
 			q = _("どの武器を投げますか? ", "Throw which item? ");
 			s = _("投げる武器がない。", "You have nothing to throw.");
-			o_ptr = choose_object(p_ptr, &item, q, s, (USE_EQUIP), 0);
+			o_ptr = choose_object(creature_ptr, &item, q, s, (USE_EQUIP), 0);
 			if (!o_ptr)
 			{
 				flush();
@@ -2400,7 +2400,7 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID
 	{
 		q = _("どのアイテムを投げますか? ", "Throw which item? ");
 		s = _("投げるアイテムがない。", "You have nothing to throw.");
-		o_ptr = choose_object(p_ptr, &item, q, s, (USE_INVEN | USE_FLOOR | USE_EQUIP), 0);
+		o_ptr = choose_object(creature_ptr, &item, q, s, (USE_INVEN | USE_FLOOR | USE_EQUIP), 0);
 		if (!o_ptr)
 		{
 			flush();
-- 
2.11.0