[Refactor] #39963 Separated spells3.h from spells1.h

[hengband/hengband.git] / src / mind.c

diff --git a/src/mind.c b/src/mind.c
index 3e1654d..2002ad4 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -15,15 +15,14 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 
 #include "mind.h"
 
-#include "floor.h"
+#include "effect/effect-characteristics.h"
 #include "melee.h"
-#include "spells.h"
 #include "spells-summon.h"
 #include "avatar.h"
 #include "player-move.h"
@@ -40,7 +39,12 @@
 #include "player-damage.h"
 #include "view/display-main-window.h"
 #include "targeting.h"
-#include "realm-song.h"
+#include "realm/realm-song.h"
+#include "effect/spells-effect-util.h"
+#include "spell/spells-type.h"
+#include "spell/process-effect.h"
+#include "spell/spells2.h"
+#include "spell/spells3.h"
 
 /*! 特殊技能の一覧テーブル */
 mind_power const mind_powers[5] =
@@ -1076,11 +1080,11 @@ static bool cast_mindcrafter_spell(player_type *caster_ptr, int spell)
                break;
        case 2:
                /* Minor displace */
-               teleport_player(caster_ptr, 10, 0L);
+               teleport_player(caster_ptr, 10, TELEPORT_SPONTANEOUS);
                break;
        case 3:
                /* Major displace */
-               teleport_player(caster_ptr, plev * 5, 0L);
+               teleport_player(caster_ptr, plev * 5, TELEPORT_SPONTANEOUS);
                break;
        case 4:
                /* Domination */
@@ -1356,7 +1360,7 @@ static bool cast_mirror_spell(player_type *caster_ptr, int spell)
                break;
                /* warped mirror */
        case 3:
-               teleport_player(caster_ptr, 10, 0L);
+               teleport_player(caster_ptr, 10, TELEPORT_SPONTANEOUS);
                break;
                /* mirror of light */
        case 4:
@@ -1364,7 +1368,7 @@ static bool cast_mirror_spell(player_type *caster_ptr, int spell)
                break;
                /* mirror of wandering */
        case 5:
-               teleport_player(caster_ptr, plev * 5, 0L);
+               teleport_player(caster_ptr, plev * 5, TELEPORT_SPONTANEOUS);
                break;
                /* robe of dust */
        case 6:
@@ -1569,7 +1573,7 @@ static bool cast_ninja_spell(player_type *caster_ptr, int spell)
                break;
        case 2:
        {
-               teleport_player(caster_ptr, 10, 0L);
+               teleport_player(caster_ptr, 10, TELEPORT_SPONTANEOUS);
                break;
        }
        case 3:
@@ -1584,7 +1588,7 @@ static bool cast_ninja_spell(player_type *caster_ptr, int spell)
        }
        case 4:
        {
-               teleport_player(caster_ptr, caster_ptr->lev * 5, 0L);
+               teleport_player(caster_ptr, caster_ptr->lev * 5, TELEPORT_SPONTANEOUS);
                break;
        }
        case 5:
@@ -1605,7 +1609,7 @@ static bool cast_ninja_spell(player_type *caster_ptr, int spell)
                break;
        case 9:
                fire_ball(caster_ptr, GF_FIRE, 0, 50+plev, plev/10+2);
-               teleport_player(caster_ptr, 30, 0L);
+               teleport_player(caster_ptr, 30, TELEPORT_SPONTANEOUS);
                set_oppose_fire(caster_ptr, (TIME_EFFECT)plev, FALSE);
                break;
        case 10:
@@ -1664,7 +1668,7 @@ static bool cast_ninja_spell(player_type *caster_ptr, int spell)
                fire_ball(caster_ptr, GF_POIS, 0, 75+plev*2/3, plev/5+2);
                fire_ball(caster_ptr, GF_HYPODYNAMIA, 0, 75+plev*2/3, plev/5+2);
                fire_ball(caster_ptr, GF_CONFUSION, 0, 75+plev*2/3, plev/5+2);
-               teleport_player(caster_ptr, 30, 0L);
+               teleport_player(caster_ptr, 30, TELEPORT_SPONTANEOUS);
                break;
        case 18:
        {