[Refactor] #37353 summon_cyber() を spells-summon.c へ移動。 / Move summon_cyber() to...

diff --git a/src/externs.h b/src/externs.h
index 97ed70f..77094d3 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -940,7 +940,6 @@ extern bool animate_dead(MONSTER_IDX who, POSITION y, POSITION x);
 extern bool sleep_monsters_touch(void);
 extern bool activate_ty_curse(bool stop_ty, int *count);
 extern int activate_hi_summon(POSITION y, POSITION x, bool can_pet);
-extern int summon_cyber(MONSTER_IDX who, POSITION y, POSITION x);
 extern void wall_breaker(void);
 extern bool confuse_monsters(HIT_POINT dam);
 extern bool charm_monsters(HIT_POINT dam);

diff --git a/src/spells-summon.c b/src/spells-summon.c
index 57a7e65..64549e6 100644 (file)
--- a/src/spells-summon.c
+++ b/src/spells-summon.c
@@ -271,3 +271,34 @@ bool summon_kin_player(DEPTH level, POSITION y, POSITION x, BIT_FLAGS mode)
        }\r
        return summon_specific((pet ? -1 : 0), y, x, level, SUMMON_KIN, mode, symbol);\r
 }\r
+\r
+/*!\r
+ * @brief サイバーデーモンの召喚\r
+ * @param who 召喚主のモンスターID(0ならばプレイヤー)\r
+ * @param y 召喚位置Y座標\r
+ * @param x 召喚位置X座標\r
+ * @return 作用が実際にあった場合TRUEを返す\r
+ */\r
+int summon_cyber(MONSTER_IDX who, POSITION y, POSITION x)\r
+{\r
+       int i;\r
+       int max_cyber = (easy_band ? 1 : (dun_level / 50) + randint1(2));\r
+       int count = 0;\r
+       BIT_FLAGS mode = PM_ALLOW_GROUP;\r
+\r
+       /* Summoned by a monster */\r
+       if (who > 0)\r
+       {\r
+               monster_type *m_ptr = &m_list[who];\r
+               if (is_pet(m_ptr)) mode |= PM_FORCE_PET;\r
+       }\r
+\r
+       if (max_cyber > 4) max_cyber = 4;\r
+\r
+       for (i = 0; i < max_cyber; i++)\r
+       {\r
+               count += summon_specific(who, y, x, 100, SUMMON_CYBER, mode, '\0');\r
+       }\r
+\r
+       return count;\r
+}
\ No newline at end of file

diff --git a/src/spells-summon.h b/src/spells-summon.h
index 5c201d9..0991623 100644 (file)
--- a/src/spells-summon.h
+++ b/src/spells-summon.h
@@ -9,4 +9,5 @@ extern bool cast_summon_demon(int power);
 extern bool item_tester_offer(object_type *o_ptr);\r
 extern bool cast_summon_greater_demon(void);\r
 extern bool summon_kin_player(DEPTH level, POSITION y, POSITION x, BIT_FLAGS mode);\r
+extern int summon_cyber(MONSTER_IDX who, POSITION y, POSITION x);\r
 \r

diff --git a/src/spells2.c b/src/spells2.c
index 0a45ea5..167b730 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -3492,38 +3492,6 @@ int activate_hi_summon(POSITION y, POSITION x, bool can_pet)
        return count;
 }
 
-
-/*!
- * @brief サイバーデーモンの召喚
- * @param who 召喚主のモンスターID(0ならばプレイヤー)
- * @param y 召喚位置Y座標
- * @param x 召喚位置X座標
- * @return 作用が実際にあった場合TRUEを返す
- */
-int summon_cyber(MONSTER_IDX who, POSITION y, POSITION x)
-{
-       int i;
-       int max_cyber = (easy_band ? 1 : (dun_level / 50) + randint1(2));
-       int count = 0;
-       BIT_FLAGS mode = PM_ALLOW_GROUP;
-
-       /* Summoned by a monster */
-       if (who > 0)
-       {
-               monster_type *m_ptr = &m_list[who];
-               if (is_pet(m_ptr)) mode |= PM_FORCE_PET;
-       }
-
-       if (max_cyber > 4) max_cyber = 4;
-
-       for (i = 0; i < max_cyber; i++)
-       {
-               count += summon_specific(who, y, x, 100, SUMMON_CYBER, mode, '\0');
-       }
-
-       return count;
-}
-
 /*!
  * @brief 周辺破壊効果(プレイヤー中心)
  * @return 作用が実際にあった場合TRUEを返す