[Refactor] #37353 型の置換。 / Type replacement. (BASE_STATUS / A_MAX)

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

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 61bce4d..0746f5a 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -319,13 +319,7 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
                chance = USE_DEVICE;\r
        }\r
 \r
-       if (world_player)\r
-       {\r
-               if (flush_failure) flush();\r
-               msg_print(_("止まった時の中ではうまく働かないようだ。", "Nothing happen. Maybe this staff is freezing too."));\r
-               sound(SOUND_FAIL);\r
-               return;\r
-       }\r
+       if (cmd_limit_time_walk(p_ptr)) return;\r
 \r
        /* Roll for usage */\r
        if ((chance < USE_DEVICE) || (randint1(chance) < USE_DEVICE) || (p_ptr->pclass == CLASS_BERSERKER))\r
@@ -342,8 +336,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
                if (flush_failure) flush();\r
                msg_print(_("この杖にはもう魔力が残っていない。", "The staff has no charges left."));\r
                o_ptr->ident |= (IDENT_EMPTY);\r
-\r
-               /* Combine / Reorder the pack (later) */\r
                p_ptr->update |= (PU_COMBINE | PU_REORDER);\r
                p_ptr->window |= (PW_INVEN);\r
 \r
@@ -361,8 +353,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
                chg_virtue(V_CHANCE, 1);\r
                chg_virtue(V_KNOWLEDGE, -1);\r
        }\r
-\r
-       /* Combine / Reorder the pack (later) */\r
        p_ptr->update |= (PU_COMBINE | PU_REORDER);\r
 \r
        /* Tried the item */\r
@@ -436,12 +426,7 @@ void do_cmd_use_staff(void)
                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
+       if (cmd_limit_arena(p_ptr)) return;\r
 \r
        if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))\r
        {\r