From c0cdc8c31b20663be9170ecf382bd3190f8a6bc1 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Tue, 16 Jul 2019 12:33:42 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20=E4=B8=80=E9=83=A8=20set?=
 =?utf8?q?=5Faction()=20=E3=81=AE=E5=BC=95=E6=95=B0=E4=BF=AE=E6=AD=A3?=
 =?utf8?q?=EF=BC=8E=20do=5Fcmd=5Fclose()=20=E3=81=AB=20player=5Ftype=20*?=
 =?utf8?q?=20=E5=BC=95=E6=95=B0=E3=82=92=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-basic.c | 18 +++++++++---------
 src/cmd-basic.h |  2 +-
 src/core.c      |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 531b4bed6..d5783e50c 100644
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -195,7 +195,7 @@ void do_cmd_go_up(player_type *creature_ptr)
 
 	if (creature_ptr->special_defense & KATA_MUSOU)
 	{
-		set_action(p_ptr, ACTION_NONE);
+		set_action(creature_ptr, ACTION_NONE);
 	}
 
 	/* Verify stairs */
@@ -963,18 +963,18 @@ static bool do_cmd_close_aux(POSITION y, POSITION x)
  * @details
  * Unlocking a locked door/chest is worth one experience point.
  */
-void do_cmd_close(void)
+void do_cmd_close(player_type *creature_ptr)
 {
 	POSITION y, x;
 	DIRECTION dir;
 
 	bool more = FALSE;
 
-	if (p_ptr->wild_mode) return;
+	if (creature_ptr->wild_mode) return;
 
-	if (p_ptr->special_defense & KATA_MUSOU)
+	if (creature_ptr->special_defense & KATA_MUSOU)
 	{
-		set_action(p_ptr, ACTION_NONE);
+		set_action(creature_ptr, ACTION_NONE);
 	}
 
 	/* Option: Pick a direction */
@@ -992,7 +992,7 @@ void do_cmd_close(void)
 	{
 		/* Set repeat count */
 		command_rep = command_arg - 1;
-		p_ptr->redraw |= (PR_STATE);
+		creature_ptr->redraw |= (PR_STATE);
 
 		/* Cancel the arg */
 		command_arg = 0;
@@ -1004,8 +1004,8 @@ void do_cmd_close(void)
 		grid_type *g_ptr;
 		FEAT_IDX feat;
 
-		y = p_ptr->y + ddy[dir];
-		x = p_ptr->x + ddx[dir];
+		y = creature_ptr->y + ddy[dir];
+		x = creature_ptr->x + ddx[dir];
 		g_ptr = &current_floor_ptr->grid_array[y][x];
 
 		/* Feature code (applying "mimic" field) */
@@ -1020,7 +1020,7 @@ void do_cmd_close(void)
 		/* Monster in the way */
 		else if (g_ptr->m_idx)
 		{
-			take_turn(p_ptr, 100);
+			take_turn(creature_ptr, 100);
 
 			msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!"));
 
diff --git a/src/cmd-basic.h b/src/cmd-basic.h
index 19a8e284b..92b5fa166 100644
--- a/src/cmd-basic.h
+++ b/src/cmd-basic.h
@@ -13,7 +13,7 @@ extern void do_cmd_go_up(player_type *creature_ptr);
 extern void do_cmd_go_down(player_type *creature_ptr);
 extern void do_cmd_search(player_type *creature_ptr);
 extern void do_cmd_open(player_type *creature_ptr);
-extern void do_cmd_close(void);
+extern void do_cmd_close(player_type *creature_ptr);
 extern void do_cmd_tunnel(void);
 extern void do_cmd_disarm(void);
 extern void do_cmd_bash(void);
diff --git a/src/core.c b/src/core.c
index 7e00354f8..23a608eb5 100644
--- a/src/core.c
+++ b/src/core.c
@@ -3786,7 +3786,7 @@ static void process_command(void)
 		/* Close a door */
 		case 'c':
 		{
-			do_cmd_close();
+			do_cmd_close(p_ptr);
 			break;
 		}
 
-- 
2.11.0