Merge remote-tracking branch 'remotes/hengbandosx/english-_ptr-in-message' into featu...

[hengband/hengband.git] / src / target / grid-selector.c

diff --git a/src/target/grid-selector.c b/src/target/grid-selector.c
index 10a0171..1c93982 100644 (file)
--- a/src/target/grid-selector.c
+++ b/src/target/grid-selector.c
@@ -12,7 +12,7 @@
 #include "io/input-key-acceptor.h"
 #include "io/screen-util.h"
 #include "system/floor-type-definition.h"
-#include "target/targeting.h"
+#include "target/target-checker.h"
 #include "term/screen-processor.h"
 #include "util/int-char-converter.h"
 #include "util/sort.h"
@@ -40,8 +40,8 @@ static bool tgt_pt_accept(player_type *creature_ptr, POSITION y, POSITION x)
     if (!(g_ptr->info & (CAVE_MARK)))
         return FALSE;
 
-    if (cave_have_flag_grid(g_ptr, FF_LESS) || cave_have_flag_grid(g_ptr, FF_MORE) || cave_have_flag_grid(g_ptr, FF_QUEST_ENTER)
-        || cave_have_flag_grid(g_ptr, FF_QUEST_EXIT))
+    if (cave_has_flag_grid(g_ptr, FF_LESS) || cave_has_flag_grid(g_ptr, FF_MORE) || cave_has_flag_grid(g_ptr, FF_QUEST_ENTER)
+        || cave_has_flag_grid(g_ptr, FF_QUEST_EXIT))
         return TRUE;
 
     return FALSE;
@@ -120,7 +120,7 @@ bool tgt_pt(player_type *creature_ptr, POSITION *x_ptr, POSITION *y_ptr)
             n++;
             for (; n < tmp_pos.n; ++n) {
                 grid_type *g_ptr = &creature_ptr->current_floor_ptr->grid_array[tmp_pos.y[n]][tmp_pos.x[n]];
-                if (cave_have_flag_grid(g_ptr, FF_STAIRS) && cave_have_flag_grid(g_ptr, ch == '>' ? FF_MORE : FF_LESS))
+                if (cave_has_flag_grid(g_ptr, FF_STAIRS) && cave_has_flag_grid(g_ptr, ch == '>' ? FF_MORE : FF_LESS))
                     break;
             }