From 9c82040a6f39a36d870416562f2d35fe20e28323 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Wed, 7 Aug 2019 23:47:48 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20do=5Fcmd=5Fuse=5Fstaff()?=
 =?utf8?q?=20=E3=81=AB=20player=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92?=
 =?utf8?q?=E8=BF=BD=E5=8A=A0=EF=BC=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd-usestaff.c | 12 ++++++------
 src/cmd-usestaff.h |  2 +-
 src/core.c         |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 8fbfda19e..386902c79 100644
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -414,26 +414,26 @@ void exe_use_staff(player_type *creature_ptr, INVENTORY_IDX item)
 * @brief 杖を使うコマンドのメインルーチン /
 * @return なし
 */
-void do_cmd_use_staff(void)
+void do_cmd_use_staff(player_type *creature_ptr)
 {
 	OBJECT_IDX item;
 	concptr q, s;
 
-	if (p_ptr->wild_mode)
+	if (creature_ptr->wild_mode)
 	{
 		return;
 	}
 
-	if (cmd_limit_arena(p_ptr)) return;
+	if (cmd_limit_arena(creature_ptr)) return;
 
-	if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
+	if (creature_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
 	{
-		set_action(p_ptr, ACTION_NONE);
+		set_action(creature_ptr, ACTION_NONE);
 	}
 
 	q = _("どの杖を使いますか? ", "Use which staff? ");
 	s = _("使える杖がない。", "You have no staff to use.");
 	if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), TV_STAFF)) return;
 
-	exe_use_staff(p_ptr, item);
+	exe_use_staff(creature_ptr, item);
 }
diff --git a/src/cmd-usestaff.h b/src/cmd-usestaff.h
index 764a3f60c..06b99051c 100644
--- a/src/cmd-usestaff.h
+++ b/src/cmd-usestaff.h
@@ -1,3 +1,3 @@
 extern int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, bool magic, bool known);
 extern void exe_use_staff(player_type *creature_ptr, INVENTORY_IDX item);
-extern void do_cmd_use_staff(void);
+extern void do_cmd_use_staff(player_type *creature_ptr);
diff --git a/src/core.c b/src/core.c
index ffc1d2c20..1ce3b4cc4 100644
--- a/src/core.c
+++ b/src/core.c
@@ -4011,7 +4011,7 @@ static void process_command(void)
 			if (use_command && !rogue_like_commands)
 				do_cmd_use();
 			else
-				do_cmd_use_staff();
+				do_cmd_use_staff(p_ptr);
 			break;
 		}
 
-- 
2.11.0