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

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

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index badf09e..6ae04fc 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -11,6 +11,11 @@
 #include "object-hook.h"
 #include "spells-summon.h"
 #include "sort.h"
+#include "projection.h"
+#include "artifact.h"
+#include "avatar.h"
+#include "spells-status.h"
+#include "realm-hex.h"
 
 /*!
 * @brief ペット入りモンスターボールをソートするための比較関数
@@ -114,13 +119,7 @@ void do_cmd_activate_aux(INVENTORY_IDX item)
        if (fail < USE_DEVICE) fail = USE_DEVICE;
        if (chance < USE_DEVICE) chance = USE_DEVICE;
 
-       if (world_player)
-       {
-               if (flush_failure) flush();
-               msg_print(_("止まった時の中ではうまく働かないようだ。", "It shows no reaction."));
-               sound(SOUND_FAIL);
-               return;
-       }
+       if(cmd_limit_time_walk(p_ptr)) return;
 
        if (p_ptr->pclass == CLASS_BERSERKER) success = FALSE;
        else if (chance > fail)
@@ -368,13 +367,7 @@ void do_cmd_activate(void)
        concptr 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 (cmd_limit_arena(p_ptr)) return;
 
        if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
        {