[Refactor] #39321 do_cmd_disarm_aux() を exe_disarm() に改名．

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 126944d..bbae379 100644 (file)
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -1466,7 +1466,7 @@ static bool do_cmd_disarm_chest(POSITION y, POSITION x, OBJECT_IDX o_idx)
  * </pre>
  */
 
-bool do_cmd_disarm_aux(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir)
+bool exe_disarm(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir)
 {
        grid_type *g_ptr = &current_floor_ptr->grid_array[y][x];
 
@@ -1625,7 +1625,7 @@ void do_cmd_disarm(player_type *creature_ptr)
                /* Disarm trap */
                else
                {
-                       more = do_cmd_disarm_aux(creature_ptr, y, x, dir);
+                       more = exe_disarm(creature_ptr, y, x, dir);
                }
        }
 
@@ -1897,7 +1897,7 @@ void do_cmd_alter(void)
                /* Disarm traps */
                else if (have_flag(f_ptr->flags, FF_DISARM))
                {
-                       more = do_cmd_disarm_aux(p_ptr, y, x, dir);
+                       more = exe_disarm(p_ptr, y, x, dir);
                }
 
                else

diff --git a/src/cmd-basic.h b/src/cmd-basic.h
index b0354cc..cc5d62a 100644 (file)
--- a/src/cmd-basic.h
+++ b/src/cmd-basic.h
@@ -27,6 +27,6 @@ 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 bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken);
 extern bool easy_open_door(player_type *creature_ptr, POSITION y, POSITION x);
-extern bool do_cmd_disarm_aux(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir);
+extern bool exe_disarm(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir);
 
 extern void kamaenaoshi(INVENTORY_IDX item);

diff --git a/src/player-move.c b/src/player-move.c
index 255ad9d..8ab9373 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -1142,7 +1142,7 @@ void move_player(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
        {
                if (!trap_can_be_ignored(p_ptr, g_ptr->feat))
                {
-                       (void)do_cmd_disarm_aux(creature_ptr, y, x, dir);
+                       (void)exe_disarm(creature_ptr, y, x, dir);
                        return;
                }
        }