[Refactor] #37353 wand_effect()のインデント修正。 / Fix indent of wand_effect().

[hengband/hengband.git] / src / cmd-usestaff.c

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 7b9ade1..f2375c5 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -471,7 +471,19 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
 void do_cmd_use_staff(void)\r
 {\r
        OBJECT_IDX item;\r
-       cptr q, s;\r
+       concptr q, s;\r
+\r
+       if (p_ptr->wild_mode)\r
+       {\r
+               return;\r
+       }\r
+\r
+       if (p_ptr->inside_arena)\r
+       {\r
+               msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));\r
+               msg_print(NULL);\r
+               return;\r
+       }\r
 \r
        if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))\r
        {\r
@@ -484,7 +496,7 @@ void do_cmd_use_staff(void)
        q = _("どの杖を使いますか? ", "Use which staff? ");\r
        s = _("使える杖がない。", "You have no staff to use.");\r
 \r
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;\r
+       if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR))) return;\r
 \r
        do_cmd_use_staff_aux(item);\r
 }\r