[Refactor] #41156 Conflict 対策に have_flag() を has_flag() へ / Rename have_flag() to...

[hengband/hengband.git] / src / floor / pattern-walk.c

diff --git a/src/floor/pattern-walk.c b/src/floor/pattern-walk.c
index c3ea406..7d3c151 100644 (file)
--- a/src/floor/pattern-walk.c
+++ b/src/floor/pattern-walk.c
@@ -3,8 +3,8 @@
 #include "core/asking-player.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
-#include "floor/floor-save.h"
-#include "floor/floor.h"
+#include "floor/cave.h"
+#include "floor/floor-mode-changer.h"
 #include "game-option/birth-options.h"
 #include "game-option/play-record-options.h"
 #include "game-option/special-options.h"
@@ -19,6 +19,7 @@
 #include "spell-kind/spells-teleport.h"
 #include "status/bad-status-setter.h"
 #include "status/experience.h"
+#include "system/floor-type-definition.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
 #include "world/world.h"
@@ -158,8 +159,8 @@ bool pattern_seq(player_type *creature_ptr, POSITION c_y, POSITION c_x, POSITION
 {
     feature_type *cur_f_ptr = &f_info[creature_ptr->current_floor_ptr->grid_array[c_y][c_x].feat];
     feature_type *new_f_ptr = &f_info[creature_ptr->current_floor_ptr->grid_array[n_y][n_x].feat];
-    bool is_pattern_tile_cur = have_flag(cur_f_ptr->flags, FF_PATTERN);
-    bool is_pattern_tile_new = have_flag(new_f_ptr->flags, FF_PATTERN);
+    bool is_pattern_tile_cur = has_flag(cur_f_ptr->flags, FF_PATTERN);
+    bool is_pattern_tile_new = has_flag(new_f_ptr->flags, FF_PATTERN);
     if (!is_pattern_tile_cur && !is_pattern_tile_new)
         return TRUE;