[Refactor] #37353 アリーナのコマンド制限処理を cmd_limit_arena() に統合。 / Integrate command limitatio...

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

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index 1b3383f..0dc1c83 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 ペット入りモンスターボールをソートするための比較関数
@@ -183,12 +188,12 @@ void do_cmd_activate_aux(INVENTORY_IDX item)
 
                {
                        IDX pet_ctr, i;
-                       IDX *who;
+                       MONSTER_IDX *who;
                        int max_pet = 0;
                        u16b dummy_why;
 
                        /* Allocate the "who" array */
-                       C_MAKE(who, max_m_idx, IDX);
+                       C_MAKE(who, max_m_idx, MONSTER_IDX);
 
                        /* Process the monsters (backwards) */
                        for (pet_ctr = m_max - 1; pet_ctr >= 1; pet_ctr--)
@@ -368,13 +373,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))
        {