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

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 8fbfda1..386902c 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -414,26 +414,26 @@ void exe_use_staff(player_type *creature_ptr, INVENTORY_IDX item)
 * @brief 杖を使うコマンドのメインルーチン /
 * @return なし
 */
-void do_cmd_use_staff(void)
+void do_cmd_use_staff(player_type *creature_ptr)
 {
        OBJECT_IDX item;
        concptr q, s;
 
-       if (p_ptr->wild_mode)
+       if (creature_ptr->wild_mode)
        {
                return;
        }
 
-       if (cmd_limit_arena(p_ptr)) return;
+       if (cmd_limit_arena(creature_ptr)) return;
 
-       if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
+       if (creature_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
        {
-               set_action(p_ptr, ACTION_NONE);
+               set_action(creature_ptr, ACTION_NONE);
        }
 
        q = _("どの杖を使いますか? ", "Use which staff? ");
        s = _("使える杖がない。", "You have no staff to use.");
        if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), TV_STAFF)) return;
 
-       exe_use_staff(p_ptr, item);
+       exe_use_staff(creature_ptr, item);
 }

diff --git a/src/cmd-usestaff.h b/src/cmd-usestaff.h
index 764a3f6..06b9905 100644 (file)
--- a/src/cmd-usestaff.h
+++ b/src/cmd-usestaff.h
@@ -1,3 +1,3 @@
 extern int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, bool magic, bool known);
 extern void exe_use_staff(player_type *creature_ptr, INVENTORY_IDX item);
-extern void do_cmd_use_staff(void);
+extern void do_cmd_use_staff(player_type *creature_ptr);

diff --git a/src/core.c b/src/core.c
index ffc1d2c..1ce3b4c 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -4011,7 +4011,7 @@ static void process_command(void)
                        if (use_command && !rogue_like_commands)
                                do_cmd_use();
                        else
-                               do_cmd_use_staff();
+                               do_cmd_use_staff(p_ptr);
                        break;
                }