[Refactor] #38852 いくつかの do_cmd_*() をリファクタリング。 / Refactor some do_cmd_*().

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

diff --git a/src/cmd-item.c b/src/cmd-item.c
index ecd9f83..a86e00a 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -21,7 +21,6 @@
 #include "cmd-zaprod.h"
 #include "cmd-zapwand.h"
 
-#include "player-item.h"
 #include "object-hook.h"
 
 
@@ -982,7 +981,7 @@ void do_cmd_uninscribe(void)
        o_ptr->inscription = 0;
 
        /* Combine the pack */
-       p_ptr->notice |= (PN_COMBINE);
+       p_ptr->update |= (PU_COMBINE);
 
        p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
@@ -1045,7 +1044,7 @@ void do_cmd_inscribe(void)
                o_ptr->inscription = quark_add(out_val);
 
                /* Combine the pack */
-               p_ptr->notice |= (PN_COMBINE);
+               p_ptr->update |= (PU_COMBINE);
 
                p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
@@ -1320,6 +1319,8 @@ void do_cmd_refill(void)
  */
 void do_cmd_target(void)
 {
+       if (p_ptr->wild_mode) return;
+
        /* Target set */
        if (target_set(TARGET_KILL))
        {
@@ -1845,7 +1846,19 @@ void do_cmd_use(void)
 {
        OBJECT_IDX item;
        object_type *o_ptr;
-       cptr        q, s;
+       cptr q, s;
+
+       if (p_ptr->wild_mode)
+       {
+               return;
+       }
+
+       if (p_ptr->inside_arena)
+       {
+               msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));
+               msg_print(NULL);
+               return;
+       }
 
        if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
        {