[Refactor] #37353 TRAP_* 定義を trap.h へ移動、関連要素も整理。 / Move TRAP_* definition to trap...

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

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 48e06f9..e5e1628 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -1,4 +1,5 @@
 #include "angband.h"\r
+#include "projection.h"\r
 \r
 \r
 \r
@@ -386,7 +387,7 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
                o_ptr->ident |= (IDENT_EMPTY);\r
 \r
                /* Combine / Reorder the pack (later) */\r
-               p_ptr->notice |= (PN_COMBINE | PN_REORDER);\r
+               p_ptr->update |= (PU_COMBINE | PU_REORDER);\r
                p_ptr->window |= (PW_INVEN);\r
 \r
                return;\r
@@ -405,7 +406,7 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
        }\r
 \r
        /* Combine / Reorder the pack (later) */\r
-       p_ptr->notice |= (PN_COMBINE | PN_REORDER);\r
+       p_ptr->update |= (PU_COMBINE | PU_REORDER);\r
 \r
        /* Tried the item */\r
        object_tried(o_ptr);\r
@@ -471,7 +472,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 +497,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