From 415a64601e355ffc413a25f9e80aa5979519b34a Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Mon, 29 Jul 2019 19:21:18 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20do=5Fcmd=5Falter()=20?=
 =?utf8?q?=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-basic.c | 24 ++++++++++++------------
 src/cmd-basic.h |  3 ++-
 src/cmd-dump.h  |  1 -
 src/core.c      |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 4ff64bad1..528ca68ff 100644
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -1825,16 +1825,16 @@ void do_cmd_bash(player_type *creature_ptr)
  * of invisible monsters.
  * </pre>
  */
-void do_cmd_alter(void)
+void do_cmd_alter(player_type *creature_ptr)
 {
 	POSITION y, x;
 	DIRECTION dir;
 	grid_type *g_ptr;
 	bool more = FALSE;
 
-	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);
 	}
 
 	/* Allow repeated command */
@@ -1842,7 +1842,7 @@ void do_cmd_alter(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;
@@ -1854,8 +1854,8 @@ void do_cmd_alter(void)
 		FEAT_IDX feat;
 		feature_type *f_ptr;
 
-		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];
 
@@ -1863,7 +1863,7 @@ void do_cmd_alter(void)
 		feat = get_feat_mimic(g_ptr);
 		f_ptr = &f_info[feat];
 
-		take_turn(p_ptr, 100);
+		take_turn(creature_ptr, 100);
 
 		if (g_ptr->m_idx)
 		{
@@ -1873,31 +1873,31 @@ void do_cmd_alter(void)
 		/* Locked doors */
 		else if (have_flag(f_ptr->flags, FF_OPEN))
 		{
-			more = exe_open(p_ptr, y, x);
+			more = exe_open(creature_ptr, y, x);
 		}
 
 		/* Bash jammed doors */
 		else if (have_flag(f_ptr->flags, FF_BASH))
 		{
-			more = do_cmd_bash_aux(p_ptr, y, x, dir);
+			more = do_cmd_bash_aux(creature_ptr, y, x, dir);
 		}
 
 		/* Tunnel through walls */
 		else if (have_flag(f_ptr->flags, FF_TUNNEL))
 		{
-			more = exe_tunnel(p_ptr, y, x);
+			more = exe_tunnel(creature_ptr, y, x);
 		}
 
 		/* Close open doors */
 		else if (have_flag(f_ptr->flags, FF_CLOSE))
 		{
-			more = exe_close(p_ptr, y, x);
+			more = exe_close(creature_ptr, y, x);
 		}
 
 		/* Disarm traps */
 		else if (have_flag(f_ptr->flags, FF_DISARM))
 		{
-			more = exe_disarm(p_ptr, y, x, dir);
+			more = exe_disarm(creature_ptr, y, x, dir);
 		}
 
 		else
diff --git a/src/cmd-basic.h b/src/cmd-basic.h
index 9bb106419..2e7b47afb 100644
--- a/src/cmd-basic.h
+++ b/src/cmd-basic.h
@@ -17,7 +17,7 @@ extern void do_cmd_close(player_type *creature_ptr);
 extern void do_cmd_tunnel(player_type *creature_ptr);
 extern void do_cmd_disarm(player_type *creature_ptr);
 extern void do_cmd_bash(player_type *creature_ptr);
-extern void do_cmd_alter(void);
+extern void do_cmd_alter(player_type *creature_ptr);
 extern void do_cmd_spike(player_type *creature_ptr);
 extern void do_cmd_walk(player_type *creature_ptr, bool pickup);
 extern void do_cmd_stay(player_type *creature_ptr, bool pickup);
@@ -25,6 +25,7 @@ extern void do_cmd_run(player_type *creature_ptr);
 extern void do_cmd_rest(player_type *creature_ptr);
 extern void do_cmd_fire(player_type *creature_ptr, SPELL_IDX snipe_type);
 extern void exe_fire(INVENTORY_IDX item, object_type *j_ptr, SPELL_IDX snipe_type);
+extern void do_cmd_suicide(player_type *creature_ptr);
 extern bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_IDX shuriken);
 extern bool easy_open_door(player_type *creature_ptr, POSITION y, POSITION x);
 extern bool exe_disarm(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir);
diff --git a/src/cmd-dump.h b/src/cmd-dump.h
index e889199a6..73fcde9bd 100644
--- a/src/cmd-dump.h
+++ b/src/cmd-dump.h
@@ -70,7 +70,6 @@ extern void do_cmd_knowledge_quests_failed(FILE *fff, QUEST_IDX quest_num[]);
 extern void do_cmd_knowledge(void);
 extern void do_cmd_checkquest(void);
 extern void do_cmd_time(void);
-extern void do_cmd_suicide(player_type *creature_ptr);
 
 /*
  * Forward declare
diff --git a/src/core.c b/src/core.c
index 2eea3b87c..d42f0764c 100644
--- a/src/core.c
+++ b/src/core.c
@@ -3646,7 +3646,7 @@ static void process_command(void)
 		/* Alter a grid */
 		case '+':
 		{
-			if (!p_ptr->wild_mode) do_cmd_alter();
+			if (!p_ptr->wild_mode) do_cmd_alter(p_ptr);
 			break;
 		}
 
-- 
2.11.0