[WIP] [Refactor] #39963 Separated spells2.h from spells1.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 6beb182..92d563f 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -563,6 +563,7 @@
     <ClInclude Include="..\..\src\spell\spells-type.h" />\r
     <ClInclude Include="..\..\src\spell\spells-util.h" />\r
     <ClInclude Include="..\..\src\spell\spells-execution.h" />\r
+    <ClInclude Include="..\..\src\spell\spells2.h" />\r
     <ClInclude Include="..\..\src\spell\technic-info-table.h" />\r
     <ClInclude Include="..\..\src\view\display-characteristic.h" />\r
     <ClInclude Include="..\..\src\view\display-fruit.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 62fb096..e4538fb 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1547,6 +1547,9 @@
     <ClInclude Include="..\..\src\spell\spells1.h">
       <Filter>spell</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\spell\spells2.h">
+      <Filter>spell</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index df96370..43a226f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -194,8 +194,8 @@ hengband_SOURCES = \
        spell/spells-execution.c spell/spells-execution.h \
        spell/spells-util.h spell/spells-type.h \
        spell/process-effect.h spell/process-effect.h \
-       spell/spells1.h \
-       spell/spells1.c spell/spells2.c spell/spells3.c \
+       spell/spells1.c spell/spells1.h spell/spells2.c spell/spells2.h \
+       spell/spells3.c \
        spells-diceroll.c spells-diceroll.h \
        spells-floor.c spells-floor.h \
        spells-object.c spells-object.h \

diff --git a/src/chest.c b/src/chest.c
index ffca79b..45c4dd8 100644 (file)
--- a/src/chest.c
+++ b/src/chest.c
@@ -11,6 +11,7 @@
 #include "player-class.h"
 #include "player-effects.h"
 #include "grid.h"
+#include "spell/spells2.h"
 
 /*!
 * @brief 箱からアイテムを引き出す /

diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c
index d1f22f5..d765fc4 100644 (file)
--- a/src/cmd/cmd-activate.c
+++ b/src/cmd/cmd-activate.c
@@ -34,6 +34,7 @@
 #include "spell/spells-type.h"
 #include "spell/process-effect.h"
 #include "effect/effect-characteristics.h"
+#include "spell/spells2.h"
 
 /*!
  * @brief 装備耐性に準じたブレス効果の選択テーブル /

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index 4052927..c4ea9ba 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -29,6 +29,7 @@
 #include "targeting.h"
 #include "view/display-main-window.h"
 #include "spell/spells-type.h"
+#include "spell/spells2.h"
 
 static int damage;
 

diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c
index 07f1701..a607007 100644 (file)
--- a/src/cmd/cmd-quaff.c
+++ b/src/cmd/cmd-quaff.c
@@ -15,7 +15,7 @@
 #include "object-hook.h"
 #include "mutation.h"
 #include "avatar.h"
-#include "spell/spells1.h"
+#include "spell/spells2.h"
 #include "spells-status.h"
 #include "player-effects.h"
 #include "player-status.h"

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index 25c2356..3602b11 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -34,6 +34,7 @@
 #include "object/object-kind.h"
 #include "view/display-main-window.h"
 #include "spell/spells-type.h"
+#include "spell/spells2.h"
 
 /*!
  * @brief 巻物を読むコマンドのサブルーチン

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index 82ed684..d83aeb2 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -16,7 +16,7 @@
 #include "cmd/cmd-dump.h"
 #include "selfinfo.h"
 #include "spell/technic-info-table.h"
-#include "spell/spells1.h"
+#include "spell/spells2.h"
 #include "spells-summon.h"
 #include "realm/realm-hex.h"
 #include "mind.h"

diff --git a/src/cmd/cmd-usestaff.c b/src/cmd/cmd-usestaff.c
index b956790..3a67f79 100644 (file)
--- a/src/cmd/cmd-usestaff.c
+++ b/src/cmd/cmd-usestaff.c
@@ -9,7 +9,7 @@
 #include "player-effects.h"
 #include "player-class.h"
 #include "player-inventory.h"
-#include "spell/spells1.h"
+#include "spell/spells2.h"
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "object-hook.h"

diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c
index e80091c..e4148f3 100644 (file)
--- a/src/cmd/cmd-zaprod.c
+++ b/src/cmd/cmd-zaprod.c
@@ -16,6 +16,7 @@
 #include "floor.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
+#include "spell/spells2.h"
 
 /*!
  * @brief ロッドの効果を発動する

diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c
index 3b50ff5..67b64c2 100644 (file)
--- a/src/cmd/cmd-zapwand.c
+++ b/src/cmd/cmd-zapwand.c
@@ -15,6 +15,7 @@
 #include "floor.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
+#include "spell/spells2.h"
 
 /*!
 * @brief 魔法棒の効果を発動する

diff --git a/src/combat/melee.c b/src/combat/melee.c
index fa60d5d..e54704a 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -46,6 +46,7 @@
 #include "view/display-main-window.h"
 #include "world.h"
 #include "spells-floor.h"
+#include "spell/spells2.h"
 
 #define BLOW_EFFECT_TYPE_NONE  0
 #define BLOW_EFFECT_TYPE_FEAR  1

diff --git a/src/core.c b/src/core.c
index a5169b5..3a67f85 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -118,6 +118,7 @@
 #include "targeting.h"
 #include "spell/spells-util.h"
 #include "spell/spells-execution.h"
+#include "spell/spells2.h"
 
  /*!
   * コピーライト情報 /

diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c
index 2875a61..e46fcad 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -15,6 +15,7 @@
 #include "monsterrace-hook.h"
 #include "combat/melee.h"
 #include "spell/spells-type.h"
+#include "spell/spells2.h"
 #include "effect/effect-monster-resist-hurt.h"
 #include "effect/effect-monster-psi.h"
 #include "effect/effect-monster-domination.h"

diff --git a/src/effect/effect-player.c b/src/effect/effect-player.c
index 740544a..6e7e623 100644 (file)
--- a/src/effect/effect-player.c
+++ b/src/effect/effect-player.c
@@ -14,6 +14,7 @@
 #include "effect/spells-effect-util.h"
 #include "player-move.h"
 #include "spell/spells-type.h"
+#include "spell/spells2.h"
 #include "player-effects.h"
 #include "effect/effect-characteristics.h"
 

diff --git a/src/floor-save.c b/src/floor-save.c
index 36f4d45..8f8fa53 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -39,7 +39,7 @@
 #include "player-class.h"
 #include "player-personality.h"
 #include "world.h"
-#include "spell/spells1.h"
+#include "spell/spells2.h"
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "save.h"

diff --git a/src/mind.c b/src/mind.c
index 8189a6d..edf449d 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -43,6 +43,7 @@
 #include "effect/spells-effect-util.h"
 #include "spell/spells-type.h"
 #include "spell/process-effect.h"
+#include "spell/spells2.h"
 
 /*! 特殊技能の一覧テーブル */
 mind_power const mind_powers[5] =

diff --git a/src/monster-status.c b/src/monster-status.c
index 1647d00..8c9e693 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -15,7 +15,7 @@
 #include "monster-status.h"
 #include "monster-spell.h"
 #include "monster-process.h"
-#include "spell/spells1.h"
+#include "spell/spells2.h"
 #include "spells-summon.h"
 #include "monsterrace-hook.h"
 #include "object-curse.h"

diff --git a/src/mspells3.c b/src/mspells3.c
index c0fe5c0..0aed776 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -29,6 +29,7 @@
 #include "player-effects.h"
 #include "targeting.h"
 #include "view/display-main-window.h"
+#include "spell/spells2.h"
 
  /*!
   * @brief モンスター魔法をプレイヤーが使用する場合の換算レベル

diff --git a/src/mspells4.c b/src/mspells4.c
index 02e57f6..95e33ba 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -27,6 +27,7 @@
 #include "world.h"
 #include "view/display-main-window.h" // 暫定、後で消したい.
 #include "spell/process-effect.h"
+#include "spell/spells2.h"
 
  /*!
  * @brief モンスター2体がプレイヤーの近くに居るかの判定 /

diff --git a/src/mutation.c b/src/mutation.c
index 7f698d5..3e986b5 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -38,6 +38,7 @@
 #include "player-race.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells-type.h"
+#include "spell/spells2.h"
 
 /*!
  * @brief プレイヤーに突然変異を与える

diff --git a/src/patron.c b/src/patron.c
index c24e71f..a6bbb59 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -24,6 +24,7 @@
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "floor.h"
+#include "spell/spells2.h"
 
 #ifdef JP
 /*!

diff --git a/src/racial.c b/src/racial.c
index 6e8043d..b99fd77 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -37,6 +37,7 @@
 #include "player-class.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells-type.h"
+#include "spell/spells2.h"
 
 /*!
  * @brief 修行僧の構え設定処理

diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c
index 0e9b041..235f53d 100644 (file)
--- a/src/realm/realm-arcane.c
+++ b/src/realm/realm-arcane.c
@@ -4,7 +4,7 @@
 #include "cmd-spell.h"
 #include "avatar.h"
 
-#include "spell/spells1.h"
+#include "spell/spells2.h"
 #include "spells-floor.h"
 #include "spells-object.h"
 #include "spells-summon.h"

diff --git a/src/realm/realm-chaos.c b/src/realm/realm-chaos.c
index 00cae1a..d22b665 100644 (file)
--- a/src/realm/realm-chaos.c
+++ b/src/realm/realm-chaos.c
@@ -15,6 +15,7 @@
 #include "spell/spells-type.h"
 #include "spell/process-effect.h"
 #include "effect/effect-characteristics.h"
+#include "spell/spells2.h"
 
 /*!
 * @brief カオス領域魔法の各処理を行う

diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c
index cd7f3b2..6894fa9 100644 (file)
--- a/src/realm/realm-crusade.c
+++ b/src/realm/realm-crusade.c
@@ -15,6 +15,7 @@
 #include "targeting.h"
 #include "realm/realm-crusade.h"
 #include "spell/process-effect.h"
+#include "spell/spells2.h"
 
 /*!
 * @brief 破邪領域魔法の各処理を行う

diff --git a/src/realm/realm-daemon.c b/src/realm/realm-daemon.c
index 984d4c3..34326f9 100644 (file)
--- a/src/realm/realm-daemon.c
+++ b/src/realm/realm-daemon.c
@@ -14,6 +14,7 @@
 #include "player-damage.h"
 #include "targeting.h"
 #include "realm/realm-daemon.h"
+#include "spell/spells2.h"
 
 /*!
 * @brief 悪魔領域魔法の各処理を行う

diff --git a/src/realm/realm-death.c b/src/realm/realm-death.c
index 9ae2b24..a099ea7 100644 (file)
--- a/src/realm/realm-death.c
+++ b/src/realm/realm-death.c
@@ -15,6 +15,7 @@
 #include "realm/realm-death.h"
 #include "spell/process-effect.h"
 #include "effect/effect-characteristics.h"
+#include "spell/spells2.h"
 
 /*!
 * @brief 暗黒領域魔法の各処理を行う

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index ea1a7ce..251366b 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -41,6 +41,7 @@
 #include "spell/spells-execution.h"
 #include "spell/spells-type.h"
 #include "spell/process-effect.h"
+#include "spell/spells2.h"
 
 #define MAX_KEEP 4 /*!<呪術の最大詠唱数 */
 

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 99e3517..ae2cd26 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -25,6 +25,7 @@
 #include "spell/spells-util.h"
 #include "spell/spells-type.h"
 #include "spell/process-effect.h"
+#include "spell/spells2.h"
 
 /*!
 * @brief 剣術の各処理を行う

diff --git a/src/realm/realm-life.c b/src/realm/realm-life.c
index a6029db..36d000b 100644 (file)
--- a/src/realm/realm-life.c
+++ b/src/realm/realm-life.c
@@ -2,7 +2,7 @@
 #include "cmd-spell.h"
 #include "spells-status.h"
 #include "spells-floor.h"
-#include "spell/spells1.h"
+#include "spell/spells2.h"
 #include "player-status.h"
 #include "player-effects.h"
 #include "floor.h"

diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index 86d8704..7d6bd0e 100644 (file)
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -17,6 +17,7 @@
 #include "spell/spells-type.h"
 #include "spell/process-effect.h"
 #include "effect/effect-characteristics.h"
+#include "spell/spells2.h"
 
 /*!
 * @brief 自然領域魔法の各処理を行う

diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c
index e1b72fe..6d144af 100644 (file)
--- a/src/realm/realm-song.c
+++ b/src/realm/realm-song.c
@@ -12,6 +12,7 @@
 #include "realm/realm-song.h"
 #include "spell/process-effect.h"
 #include "effect/effect-characteristics.h"
+#include "spell/spells2.h"
 
 /*!
 * @brief 歌の開始を処理する / Start singing if the player is a Bard

diff --git a/src/realm/realm-sorcery.c b/src/realm/realm-sorcery.c
index 988d603..17fe1b3 100644 (file)
--- a/src/realm/realm-sorcery.c
+++ b/src/realm/realm-sorcery.c
@@ -11,6 +11,7 @@
 #include "player-effects.h"
 #include "targeting.h"
 #include "realm/realm-sorcery.h"
+#include "spell/spells2.h"
 
 /*!
 * @brief 仙術領域魔法の各処理を行う

diff --git a/src/realm/realm-trump.c b/src/realm/realm-trump.c
index 8e8a7f8..c507bd5 100644 (file)
--- a/src/realm/realm-trump.c
+++ b/src/realm/realm-trump.c
@@ -12,6 +12,7 @@
 #include "effect/spells-effect-util.h"
 #include "realm/realm-trump.h"
 #include "spell/spells-type.h"
+#include "spell/spells2.h"
 
 /*!
 * @brief トランプ領域魔法の各処理を行う

diff --git a/src/spell/spells1.h b/src/spell/spells1.h
index 26493ed..9e3d752 100644 (file)
--- a/src/spell/spells1.h
+++ b/src/spell/spells1.h
@@ -9,125 +9,6 @@ extern bool binding_field(player_type *caster_ptr, HIT_POINT dam);
 extern void seal_of_mirror(player_type *caster_ptr, HIT_POINT dam);
 extern concptr spell_category_name(OBJECT_TYPE_VALUE tval);
 
-/* spells2.c */
-extern bool detect_traps(player_type *caster_ptr, POSITION range, bool known);
-extern bool detect_doors(player_type *caster_ptr, POSITION range);
-extern bool detect_stairs(player_type *caster_ptr, POSITION range);
-extern bool detect_treasure(player_type *caster_ptr, POSITION range);
-extern bool detect_objects_gold(player_type *caster_ptr, POSITION range);
-extern bool detect_objects_normal(player_type *caster_ptr, POSITION range);
-extern bool detect_objects_magic(player_type *caster_ptr, POSITION range);
-extern bool detect_monsters_normal(player_type *caster_ptr, POSITION range);
-extern bool detect_monsters_invis(player_type *caster_ptr, POSITION range);
-extern bool detect_monsters_evil(player_type *caster_ptr, POSITION range);
-extern bool detect_monsters_xxx(player_type *caster_ptr, POSITION range, u32b match_flag);
-extern bool detect_monsters_string(player_type *caster_ptr, POSITION range, concptr);
-extern bool detect_monsters_nonliving(player_type *caster_ptr, POSITION range);
-extern bool detect_monsters_mind(player_type *caster_ptr, POSITION range);
-extern bool detect_all(player_type *caster_ptr, POSITION range);
-extern bool wall_stone(player_type *caster_ptr);
-extern bool speed_monsters(player_type *caster_ptr);
-extern bool slow_monsters(player_type *caster_ptr, int power);
-extern bool sleep_monsters(player_type *caster_ptr, int power);
-extern void aggravate_monsters(player_type *caster_ptr, MONSTER_IDX who);
-extern bool genocide_aux(player_type *caster_ptr, MONSTER_IDX m_idx, int power, bool player_cast, int dam_side, concptr spell_name);
-extern bool symbol_genocide(player_type *caster_ptr, int power, bool player_cast);
-extern bool mass_genocide(player_type *caster_ptr, int power, bool player_cast);
-extern bool mass_genocide_undead(player_type *caster_ptr, int power, bool player_cast);
-extern bool probing(player_type *caster_ptr);
-extern bool banish_evil(player_type *caster_ptr, int dist);
-extern bool dispel_evil(player_type *caster_ptr, HIT_POINT dam);
-extern bool dispel_good(player_type *caster_ptr, HIT_POINT dam);
-extern bool dispel_undead(player_type *caster_ptr, HIT_POINT dam);
-extern bool dispel_monsters(player_type *caster_ptr, HIT_POINT dam);
-extern bool dispel_living(player_type *caster_ptr, HIT_POINT dam);
-extern bool dispel_demons(player_type *caster_ptr, HIT_POINT dam);
-extern bool cleansing_nova(player_type *creature_ptr, bool magic, bool powerful);
-extern bool unleash_mana_storm(player_type *creature_ptr, bool powerful);
-extern bool crusade(player_type *caster_ptr);
-extern bool turn_undead(player_type *caster_ptr);
-extern void lite_room(player_type *caster_ptr, POSITION y1, POSITION x1);
-extern bool starlight(player_type *caster_ptr, bool magic);
-extern void unlite_room(player_type *caster_ptr, POSITION y1, POSITION x1);
-extern bool lite_area(player_type *caster_ptr, HIT_POINT dam, POSITION rad);
-extern bool unlite_area(player_type *caster_ptr, HIT_POINT dam, POSITION rad);
-extern bool fire_ball(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad);
-extern bool fire_breath(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad);
-extern bool fire_rocket(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad);
-extern bool fire_ball_hide(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad);
-extern bool fire_meteor(player_type *caster_ptr, MONSTER_IDX who, EFFECT_ID typ, POSITION x, POSITION y, HIT_POINT dam, POSITION rad);
-extern bool fire_bolt(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam);
-extern bool fire_blast(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, DICE_NUMBER dd, DICE_SID ds, int num, int dev);
-extern void call_chaos(player_type *caster_ptr);
-extern bool fire_beam(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam);
-extern bool fire_bolt_or_beam(player_type *caster_ptr, PERCENTAGE prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam);
-extern bool lite_line(player_type *caster_ptr, DIRECTION dir, HIT_POINT dam);
-extern bool hypodynamic_bolt(player_type *caster_ptr, DIRECTION dir, HIT_POINT dam);
-extern bool death_ray(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
-extern bool wall_to_mud(player_type *caster_ptr, DIRECTION dir, HIT_POINT dam);
-extern bool destroy_door(player_type *caster_ptr, DIRECTION dir);
-extern bool disarm_trap(player_type *caster_ptr, DIRECTION dir);
-extern bool wizard_lock(player_type *caster_ptr, DIRECTION dir);
-extern bool teleport_monster(player_type *caster_ptr, DIRECTION dir, int distance);
-extern bool door_creation(player_type *caster_ptr, POSITION y, POSITION x);
-extern bool trap_creation(player_type *caster_ptr, POSITION y, POSITION x);
-extern bool tree_creation(player_type *caster_ptr, POSITION y, POSITION x);
-extern bool glyph_creation(player_type *caster_ptr, POSITION y, POSITION x);
-extern bool destroy_doors_touch(player_type *caster_ptr);
-extern bool disarm_traps_touch(player_type *caster_ptr);
-extern bool animate_dead(player_type *caster_ptr, MONSTER_IDX who, POSITION y, POSITION x);
-extern bool sleep_monsters_touch(player_type *caster_ptr);
-extern bool activate_ty_curse(player_type *target_ptr, bool stop_ty, int *count);
-extern int activate_hi_summon(player_type *caster_ptr, POSITION y, POSITION x, bool can_pet);
-extern void wall_breaker(player_type *caster_ptr);
-extern bool confuse_monsters(player_type *caster_ptr, HIT_POINT dam);
-extern bool charm_monsters(player_type *caster_ptr, HIT_POINT dam);
-extern bool charm_animals(player_type *caster_ptr, HIT_POINT dam);
-extern bool stun_monsters(player_type *caster_ptr, HIT_POINT dam);
-extern bool stasis_monsters(player_type *caster_ptr, HIT_POINT dam);
-extern bool banish_monsters(player_type *caster_ptr, int dist);
-extern bool turn_monsters(player_type *caster_ptr, HIT_POINT dam);
-extern bool turn_evil(player_type *caster_ptr, HIT_POINT dam);
-extern bool deathray_monsters(player_type *caster_ptr);
-extern bool charm_monster(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
-extern bool control_one_undead(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
-extern bool control_one_demon(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
-extern bool charm_animal(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
-extern bool mindblast_monsters(player_type *caster_ptr, HIT_POINT dam);
-extern bool teleport_swap(player_type *caster_ptr, DIRECTION dir);
-extern bool project_hook(player_type *caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, BIT_FLAGS flg);
-extern bool project_all_los(player_type *caster_ptr, EFFECT_ID typ, HIT_POINT dam);
-extern bool eat_magic(player_type *caster_ptr, int power);
-extern void discharge_minion(player_type *caster_ptr);
-extern bool kawarimi(player_type *caster_ptr, bool success);
-extern bool rush_attack(player_type *attacker_ptr, bool *mdeath);
-extern void remove_all_mirrors(player_type *caster_ptr, bool explode);
-extern void ring_of_power(player_type *caster_ptr, DIRECTION dir);
-extern void wild_magic(player_type *caster_ptr, int spell);
-extern void cast_meteor(player_type *caster_ptr, HIT_POINT dam, POSITION rad);
-extern bool cast_wrath_of_the_god(player_type *caster_ptr, HIT_POINT dam, POSITION rad);
-extern void cast_wonder(player_type *caster_ptr, DIRECTION dir);
-extern void cast_invoke_spirits(player_type *caster_ptr, DIRECTION dir);
-extern void cast_shuffle(player_type *caster_ptr);
-extern bool_hack vampirism(player_type *caster_ptr);
-extern bool hit_and_away(player_type *caster_ptr);
-extern bool psychometry(player_type *caster_ptr);
-extern bool draconian_breath(player_type *creature_ptr);
-extern bool android_inside_weapon(player_type *creature_ptr);
-extern bool create_ration(player_type *crature_ptr);
-extern void hayagake(player_type *creature_ptr);
-extern bool double_attack(player_type *creature_ptr);
-extern bool comvert_hp_to_mp(player_type *creature_ptr);
-extern bool comvert_mp_to_hp(player_type *creature_ptr);
-extern bool demonic_breath(player_type *creature_ptr);
-extern bool mirror_concentration(player_type *creature_ptr);
-extern bool sword_dancing(player_type *creature_ptr);
-extern bool confusing_light(player_type *creature_ptr);
-extern bool rodeo(player_type *creature_ptr);
-extern bool clear_mind(player_type *creature_ptr);
-extern bool concentration(player_type *creature_ptr);
-extern bool vanish_dungeon(player_type *caster_ptr);
-
 /* spells3.c */
 extern bool teleport_away(player_type *caster_ptr, MONSTER_IDX m_idx, POSITION dis, teleport_flags mode);
 extern void teleport_monster_to(player_type *caster_ptr, MONSTER_IDX m_idx, POSITION ty, POSITION tx, int power, teleport_flags mode);

diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 6ed0b37..6cc8a55 100644 (file)
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -29,7 +29,7 @@
 #include "monsterrace-hook.h"
 #include "melee.h"
 #include "world.h"
-#include "spell/spells1.h"
+#include "spell/spells2.h"
 #include "spells-summon.h"
 #include "mutation.h"
 #include "quest.h"

diff --git a/src/spell/spells2.h b/src/spell/spells2.h
new file mode 100644 (file)
index 0000000..80db455
--- /dev/null
+++ b/src/spell/spells2.h
@@ -0,0 +1,119 @@
+#pragma once
+
+bool detect_traps(player_type* caster_ptr, POSITION range, bool known);
+bool detect_doors(player_type* caster_ptr, POSITION range);
+bool detect_stairs(player_type* caster_ptr, POSITION range);
+bool detect_treasure(player_type* caster_ptr, POSITION range);
+bool detect_objects_gold(player_type* caster_ptr, POSITION range);
+bool detect_objects_normal(player_type* caster_ptr, POSITION range);
+bool detect_objects_magic(player_type* caster_ptr, POSITION range);
+bool detect_monsters_normal(player_type* caster_ptr, POSITION range);
+bool detect_monsters_invis(player_type* caster_ptr, POSITION range);
+bool detect_monsters_evil(player_type* caster_ptr, POSITION range);
+bool detect_monsters_xxx(player_type* caster_ptr, POSITION range, u32b match_flag);
+bool detect_monsters_string(player_type* caster_ptr, POSITION range, concptr);
+bool detect_monsters_nonliving(player_type* caster_ptr, POSITION range);
+bool detect_monsters_mind(player_type* caster_ptr, POSITION range);
+bool detect_all(player_type* caster_ptr, POSITION range);
+bool wall_stone(player_type* caster_ptr);
+bool speed_monsters(player_type* caster_ptr);
+bool slow_monsters(player_type* caster_ptr, int power);
+bool sleep_monsters(player_type* caster_ptr, int power);
+void aggravate_monsters(player_type* caster_ptr, MONSTER_IDX who);
+bool genocide_aux(player_type* caster_ptr, MONSTER_IDX m_idx, int power, bool player_cast, int dam_side, concptr spell_name);
+bool symbol_genocide(player_type* caster_ptr, int power, bool player_cast);
+bool mass_genocide(player_type* caster_ptr, int power, bool player_cast);
+bool mass_genocide_undead(player_type* caster_ptr, int power, bool player_cast);
+bool probing(player_type* caster_ptr);
+bool banish_evil(player_type* caster_ptr, int dist);
+bool dispel_evil(player_type* caster_ptr, HIT_POINT dam);
+bool dispel_good(player_type* caster_ptr, HIT_POINT dam);
+bool dispel_undead(player_type* caster_ptr, HIT_POINT dam);
+bool dispel_monsters(player_type* caster_ptr, HIT_POINT dam);
+bool dispel_living(player_type* caster_ptr, HIT_POINT dam);
+bool dispel_demons(player_type* caster_ptr, HIT_POINT dam);
+bool cleansing_nova(player_type* creature_ptr, bool magic, bool powerful);
+bool unleash_mana_storm(player_type* creature_ptr, bool powerful);
+bool crusade(player_type* caster_ptr);
+bool turn_undead(player_type* caster_ptr);
+void lite_room(player_type* caster_ptr, POSITION y1, POSITION x1);
+bool starlight(player_type* caster_ptr, bool magic);
+void unlite_room(player_type* caster_ptr, POSITION y1, POSITION x1);
+bool lite_area(player_type* caster_ptr, HIT_POINT dam, POSITION rad);
+bool unlite_area(player_type* caster_ptr, HIT_POINT dam, POSITION rad);
+bool fire_ball(player_type* caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad);
+bool fire_breath(player_type* caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad);
+bool fire_rocket(player_type* caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad);
+bool fire_ball_hide(player_type* caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad);
+bool fire_meteor(player_type* caster_ptr, MONSTER_IDX who, EFFECT_ID typ, POSITION x, POSITION y, HIT_POINT dam, POSITION rad);
+bool fire_bolt(player_type* caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam);
+bool fire_blast(player_type* caster_ptr, EFFECT_ID typ, DIRECTION dir, DICE_NUMBER dd, DICE_SID ds, int num, int dev);
+void call_chaos(player_type* caster_ptr);
+bool fire_beam(player_type* caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam);
+bool fire_bolt_or_beam(player_type* caster_ptr, PERCENTAGE prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam);
+bool lite_line(player_type* caster_ptr, DIRECTION dir, HIT_POINT dam);
+bool hypodynamic_bolt(player_type* caster_ptr, DIRECTION dir, HIT_POINT dam);
+bool death_ray(player_type* caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
+bool wall_to_mud(player_type* caster_ptr, DIRECTION dir, HIT_POINT dam);
+bool destroy_door(player_type* caster_ptr, DIRECTION dir);
+bool disarm_trap(player_type* caster_ptr, DIRECTION dir);
+bool wizard_lock(player_type* caster_ptr, DIRECTION dir);
+bool teleport_monster(player_type* caster_ptr, DIRECTION dir, int distance);
+bool door_creation(player_type* caster_ptr, POSITION y, POSITION x);
+bool trap_creation(player_type* caster_ptr, POSITION y, POSITION x);
+bool tree_creation(player_type* caster_ptr, POSITION y, POSITION x);
+bool glyph_creation(player_type* caster_ptr, POSITION y, POSITION x);
+bool destroy_doors_touch(player_type* caster_ptr);
+bool disarm_traps_touch(player_type* caster_ptr);
+bool animate_dead(player_type* caster_ptr, MONSTER_IDX who, POSITION y, POSITION x);
+bool sleep_monsters_touch(player_type* caster_ptr);
+bool activate_ty_curse(player_type* target_ptr, bool stop_ty, int* count);
+int activate_hi_summon(player_type* caster_ptr, POSITION y, POSITION x, bool can_pet);
+void wall_breaker(player_type* caster_ptr);
+bool confuse_monsters(player_type* caster_ptr, HIT_POINT dam);
+bool charm_monsters(player_type* caster_ptr, HIT_POINT dam);
+bool charm_animals(player_type* caster_ptr, HIT_POINT dam);
+bool stun_monsters(player_type* caster_ptr, HIT_POINT dam);
+bool stasis_monsters(player_type* caster_ptr, HIT_POINT dam);
+bool banish_monsters(player_type* caster_ptr, int dist);
+bool turn_monsters(player_type* caster_ptr, HIT_POINT dam);
+bool turn_evil(player_type* caster_ptr, HIT_POINT dam);
+bool deathray_monsters(player_type* caster_ptr);
+bool charm_monster(player_type* caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
+bool control_one_undead(player_type* caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
+bool control_one_demon(player_type* caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
+bool charm_animal(player_type* caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
+bool mindblast_monsters(player_type* caster_ptr, HIT_POINT dam);
+bool teleport_swap(player_type* caster_ptr, DIRECTION dir);
+bool project_hook(player_type* caster_ptr, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, BIT_FLAGS flg);
+bool project_all_los(player_type* caster_ptr, EFFECT_ID typ, HIT_POINT dam);
+bool eat_magic(player_type* caster_ptr, int power);
+void discharge_minion(player_type* caster_ptr);
+bool kawarimi(player_type* caster_ptr, bool success);
+bool rush_attack(player_type* attacker_ptr, bool* mdeath);
+void remove_all_mirrors(player_type* caster_ptr, bool explode);
+void ring_of_power(player_type* caster_ptr, DIRECTION dir);
+void wild_magic(player_type* caster_ptr, int spell);
+void cast_meteor(player_type* caster_ptr, HIT_POINT dam, POSITION rad);
+bool cast_wrath_of_the_god(player_type* caster_ptr, HIT_POINT dam, POSITION rad);
+void cast_wonder(player_type* caster_ptr, DIRECTION dir);
+void cast_invoke_spirits(player_type* caster_ptr, DIRECTION dir);
+void cast_shuffle(player_type* caster_ptr);
+bool_hack vampirism(player_type* caster_ptr);
+bool hit_and_away(player_type* caster_ptr);
+bool psychometry(player_type* caster_ptr);
+bool draconian_breath(player_type* creature_ptr);
+bool android_inside_weapon(player_type* creature_ptr);
+bool create_ration(player_type* crature_ptr);
+void hayagake(player_type* creature_ptr);
+bool double_attack(player_type* creature_ptr);
+bool comvert_hp_to_mp(player_type* creature_ptr);
+bool comvert_mp_to_hp(player_type* creature_ptr);
+bool demonic_breath(player_type* creature_ptr);
+bool mirror_concentration(player_type* creature_ptr);
+bool sword_dancing(player_type* creature_ptr);
+bool confusing_light(player_type* creature_ptr);
+bool rodeo(player_type* creature_ptr);
+bool clear_mind(player_type* creature_ptr);
+bool concentration(player_type* creature_ptr);
+bool vanish_dungeon(player_type* caster_ptr);

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index a338559..907df14 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -37,7 +37,7 @@
 #include "quest.h"
 #include "artifact.h"
 #include "avatar.h"
-#include "spell/spells1.h"
+#include "spell/spells2.h"
 #include "spells-floor.h"
 #include "spell/technic-info-table.h"
 #include "grid.h"

diff --git a/src/spells-status.c b/src/spells-status.c
index 524c7f4..88958f0 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -17,6 +17,7 @@
 #include "targeting.h"
 #include "realm/realm-song.h"
 #include "view/display-main-window.h"
+#include "spell/spells2.h"
 
 /*!
  * @brief モンスター回復処理

diff --git a/src/spells-summon.c b/src/spells-summon.c
index 393b477..a0eb8d7 100644 (file)
--- a/src/spells-summon.c
+++ b/src/spells-summon.c
@@ -6,6 +6,7 @@
 #include "monster-status.h"
 #include "floor.h"
 #include "effect/spells-effect-util.h"
+#include "spell/spells2.h"
 
 /*!
 * @brief トランプ魔法独自の召喚処理を行う / Handle summoning and failure of trump spells

diff --git a/src/trap.c b/src/trap.c
index 4d9a4b6..84cfcaa 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -25,6 +25,7 @@
 #include "dungeon.h"
 #include "world.h"
 #include "spell/process-effect.h"
+#include "spell/spells2.h"
 
 static s16b normal_traps[MAX_NORMAL_TRAPS];
 

diff --git a/src/wizard2.c b/src/wizard2.c
index e7e1f26..b7fa5d6 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -56,6 +56,7 @@
 #include "targeting.h"
 #include "view/display-main-window.h"
 #include "world.h"
+#include "spell/spells2.h"
 
 #define NUM_O_SET 8
 #define NUM_O_BIT 32