Merge remote-tracking branch 'remotes/origin/For2.2.2-Fix-Hourier' into For2.2.2...

[hengband/hengband.git] / src / realm / realm-sorcery.c

diff --git a/src/realm-sorcery.c b/src/realm/realm-sorcery.c
similarity index 98%
rename from src/realm-sorcery.c
rename to src/realm/realm-sorcery.c
index 260c79e..988d603 100644 (file)
--- a/src/realm-sorcery.c
+++ b/src/realm/realm-sorcery.c
@@ -5,11 +5,12 @@
 #include "selfinfo.h"
 #include "avatar.h"
 
-#include "spells.h"
+#include "spell/spells-type.h"
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "player-effects.h"
 #include "targeting.h"
+#include "realm/realm-sorcery.h"
 
 /*!
 * @brief 仙術領域魔法の各処理を行う
@@ -18,7 +19,7 @@
 * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
 * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。
 */
-concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
+concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode)
 {
        bool name = (mode == SPELL_NAME) ? TRUE : FALSE;
        bool desc = (mode == SPELL_DESC) ? TRUE : FALSE;
@@ -57,7 +58,7 @@ concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod
 
                        if (cast)
                        {
-                               teleport_player(caster_ptr, range, 0L);
+                               teleport_player(caster_ptr, range, TELEPORT_SPONTANEOUS);
                        }
                }
                break;
@@ -127,7 +128,7 @@ concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod
 
                        if (cast)
                        {
-                               teleport_player(caster_ptr, range, 0L);
+                               teleport_player(caster_ptr, range, TELEPORT_SPONTANEOUS);
                        }
                }
                break;