[Refactor] #38997 do_cmd_activate() に player_type * 引数を使用者として追加．

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index 4f1926f..0d85ee6 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -630,15 +630,15 @@ void exe_activate(player_type *user_ptr, INVENTORY_IDX item)
  * @brief 装備を発動するコマンドのメインルーチン /
  * @return なし
  */
-void do_cmd_activate(void)
+void do_cmd_activate(player_type *user_ptr)
 {
        OBJECT_IDX item;
        concptr q, s;
 
-       if (p_ptr->wild_mode) return;
-       if (cmd_limit_arena(p_ptr)) return;
+       if (user_ptr->wild_mode) return;
+       if (cmd_limit_arena(user_ptr)) return;
 
-       if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
+       if (user_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
        {
                set_action(ACTION_NONE);
        }
@@ -651,7 +651,7 @@ void do_cmd_activate(void)
        if (!choose_object(&item, q, s, (USE_EQUIP | IGNORE_BOTHHAND_SLOT), 0)) return;
 
        /* Activate the item */
-       exe_activate(p_ptr, item);
+       exe_activate(user_ptr, item);
 }
 
 /*!

diff --git a/src/cmd-activate.h b/src/cmd-activate.h
index af8fce8..21b4466 100644 (file)
--- a/src/cmd-activate.h
+++ b/src/cmd-activate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-extern void do_cmd_activate(void);
+extern void do_cmd_activate(player_type *user_ptr);
 extern void exe_activate(player_type *user_ptr, INVENTORY_IDX item);
 extern bool activate_artifact(object_type * o_ptr);
 

diff --git a/src/core.c b/src/core.c
index abd4441..480fe5c 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -3965,7 +3965,7 @@ static void process_command(void)
                /* Activate an artifact */
                case 'A':
                {
-                       do_cmd_activate();
+                       do_cmd_activate(p_ptr);
                        break;
                }