[Refactor] #38997 do_cmd_spike() に player_type * 引数を追加．

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index d5783e5..9993cda 100644 (file)
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -1956,15 +1956,14 @@ static bool get_spike(INVENTORY_IDX *ip)
  * This command may NOT be repeated
  * </pre>
  */
-void do_cmd_spike(void)
+void do_cmd_spike(player_type *creature_ptr)
 {
        DIRECTION dir;
 
-       if (p_ptr->wild_mode) return;
-
-       if (p_ptr->special_defense & KATA_MUSOU)
+       if (creature_ptr->wild_mode) return;
+       if (creature_ptr->special_defense & KATA_MUSOU)
        {
-               set_action(p_ptr, ACTION_NONE);
+               set_action(creature_ptr, ACTION_NONE);
        }
 
        /* Get a "repeated" direction */
@@ -1975,8 +1974,8 @@ void do_cmd_spike(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) */
@@ -1997,7 +1996,7 @@ void do_cmd_spike(void)
                /* Is a 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!"));
 
@@ -2008,7 +2007,7 @@ void do_cmd_spike(void)
                /* Go for it */
                else
                {
-                       take_turn(p_ptr, 100);
+                       take_turn(creature_ptr, 100);
 
                        /* Successful jamming */
                        msg_format(_("%sにくさびを打ち込んだ。", "You jam the %s with a spike."), f_name + f_info[feat].name);

diff --git a/src/cmd-basic.h b/src/cmd-basic.h
index 92b5fa1..63cc90b 100644 (file)
--- a/src/cmd-basic.h
+++ b/src/cmd-basic.h
@@ -18,7 +18,7 @@ extern void do_cmd_tunnel(void);
 extern void do_cmd_disarm(void);
 extern void do_cmd_bash(void);
 extern void do_cmd_alter(void);
-extern void do_cmd_spike(void);
+extern void do_cmd_spike(player_type *creature_ptr);
 extern void do_cmd_walk(bool pickup);
 extern void do_cmd_stay(bool pickup);
 extern void do_cmd_run(void);

diff --git a/src/cmd-item.c b/src/cmd-item.c
index b3fabbd..04839e9 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -1542,7 +1542,7 @@ void do_cmd_use(void)
        switch (o_ptr->tval)
        {
                case TV_SPIKE:
-                       do_cmd_spike();
+                       do_cmd_spike(p_ptr);
                        break;
 
                case TV_FOOD:

diff --git a/src/core.c b/src/core.c
index 23a608e..b164455 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -3793,7 +3793,7 @@ static void process_command(void)
                /* Jam a door with spikes */
                case 'j':
                {
-                       do_cmd_spike();
+                       do_cmd_spike(p_ptr);
                        break;
                }