[Refactor] #39963 Moved TELEPORT_* from spells.h to spells-util.h and made them enum...

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

diff --git a/src/spells2.c b/src/spells2.c
index 6ad102a..038a135 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -37,8 +37,8 @@
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "spells-diceroll.h"
-#include "realm-hex.h"
-#include "autopick.h"
+#include "realm/realm-hex.h"
+#include "autopick/autopick.h"
 #include "object-flavor.h"
 #include "object-hook.h"
 #include "monster-status.h"
@@ -53,12 +53,14 @@
 #include "dungeon.h"
 #include "floor-events.h"
 #include "feature.h"
-#include "view-mainwindow.h"
-#include "objectkind.h"
+#include "view/display-main-window.h"
+#include "object/object-kind.h"
 #include "monsterrace.h"
 #include "targeting.h"
-#include "realm-song.h"
+#include "realm/realm-song.h"
 #include "english.h"
+#include "effect/spells-effect-util.h"
+#include "spell/spells-type.h"
 
  /*!
   * @brief プレイヤー周辺の地形を感知する
@@ -2860,7 +2862,7 @@ bool kawarimi(player_type *caster_ptr, bool success)
        POSITION y = caster_ptr->y;
        POSITION x = caster_ptr->x;
 
-       teleport_player(caster_ptr, 10 + randint1(90), 0L);
+       teleport_player(caster_ptr, 10 + randint1(90), TELEPORT_SPONTANEOUS);
        object_wipe(q_ptr);
        object_prep(q_ptr, lookup_kind(TV_STATUE, SV_WOODEN_STATUE));
 
@@ -3907,7 +3909,7 @@ bool hit_and_away(player_type *caster_ptr)
                if (randint0(caster_ptr->skill_dis) < 7)
                        msg_print(_("うまく逃げられなかった。", "You failed to run away."));
                else
-                       teleport_player(caster_ptr, 30, 0L);
+                       teleport_player(caster_ptr, 30, TELEPORT_SPONTANEOUS);
                return TRUE;
        }