[Refactor] cave_have_flag_bold() を cave_has_flag_bold() に改名. / Rename cave_have_flag_...

diff --git a/src/action/run-execution.c b/src/action/run-execution.c
index 6d214bf..81dcc5d 100644 (file)
--- a/src/action/run-execution.c
+++ b/src/action/run-execution.c
@@ -101,7 +101,7 @@ static void run_init(player_type *creature_ptr, DIRECTION dir)
     creature_ptr->run_px = creature_ptr->x;
     int row = creature_ptr->y + ddy[dir];
     int col = creature_ptr->x + ddx[dir];
-    ignore_avoid_run = cave_have_flag_bold(creature_ptr->current_floor_ptr, row, col, FF_AVOID_RUN);
+    ignore_avoid_run = cave_has_flag_bold(creature_ptr->current_floor_ptr, row, col, FF_AVOID_RUN);
     int i = chome[dir];
     if (see_wall(creature_ptr, cycle[i + 1], creature_ptr->y, creature_ptr->x)) {
         find_breakleft = TRUE;

diff --git a/src/cmd-action/cmd-move.c b/src/cmd-action/cmd-move.c
index 4143875..250afa5 100644 (file)
--- a/src/cmd-action/cmd-move.c
+++ b/src/cmd-action/cmd-move.c
@@ -308,7 +308,7 @@ void do_cmd_walk(player_type *creature_ptr, bool pickup)
         more = TRUE;
     }
 
-    if (creature_ptr->wild_mode && !cave_have_flag_bold(creature_ptr->current_floor_ptr, creature_ptr->y, creature_ptr->x, FF_TOWN)) {
+    if (creature_ptr->wild_mode && !cave_has_flag_bold(creature_ptr->current_floor_ptr, creature_ptr->y, creature_ptr->x, FF_TOWN)) {
         int tmp = 120 + creature_ptr->lev * 10 - wilderness[creature_ptr->y][creature_ptr->x].level + 5;
         if (tmp < 1)
             tmp = 1;

diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c
index 8225e31..a41dbda 100644 (file)
--- a/src/cmd-building/cmd-building.c
+++ b/src/cmd-building/cmd-building.c
@@ -306,7 +306,7 @@ void do_cmd_building(player_type *player_ptr)
 
        take_turn(player_ptr, 100);
 
-       if (!cave_have_flag_bold(player_ptr->current_floor_ptr, player_ptr->y, player_ptr->x, FF_BLDG))
+       if (!cave_has_flag_bold(player_ptr->current_floor_ptr, player_ptr->y, player_ptr->x, FF_BLDG))
        {
                msg_print(_("ここには建物はない。", "You see no building here."));
                return;

diff --git a/src/cmd-item/cmd-throw.c b/src/cmd-item/cmd-throw.c
index 90f8a6f..fdeada1 100644 (file)
--- a/src/cmd-item/cmd-throw.c
+++ b/src/cmd-item/cmd-throw.c
@@ -223,7 +223,7 @@ static bool check_racial_target_bold(player_type *creature_ptr, it_type *it_ptr)
     it_ptr->ny[it_ptr->cur_dis] = it_ptr->y;
     it_ptr->nx[it_ptr->cur_dis] = it_ptr->x;
     mmove2(&it_ptr->ny[it_ptr->cur_dis], &it_ptr->nx[it_ptr->cur_dis], creature_ptr->y, creature_ptr->x, it_ptr->ty, it_ptr->tx);
-    if (cave_have_flag_bold(creature_ptr->current_floor_ptr, it_ptr->ny[it_ptr->cur_dis], it_ptr->nx[it_ptr->cur_dis], FF_PROJECT))
+    if (cave_has_flag_bold(creature_ptr->current_floor_ptr, it_ptr->ny[it_ptr->cur_dis], it_ptr->nx[it_ptr->cur_dis], FF_PROJECT))
         return FALSE;
 
     it_ptr->hit_wall = TRUE;
@@ -491,7 +491,7 @@ static void drop_thrown_item(player_type *creature_ptr, it_type *it_ptr)
     if (!it_ptr->do_drop)
         return;
 
-    if (cave_have_flag_bold(creature_ptr->current_floor_ptr, it_ptr->y, it_ptr->x, FF_PROJECT))
+    if (cave_has_flag_bold(creature_ptr->current_floor_ptr, it_ptr->y, it_ptr->x, FF_PROJECT))
         (void)drop_near(creature_ptr, it_ptr->q_ptr, it_ptr->corruption_possibility, it_ptr->y, it_ptr->x);
     else
         (void)drop_near(creature_ptr, it_ptr->q_ptr, it_ptr->corruption_possibility, it_ptr->prev_y, it_ptr->prev_x);

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index deea1e1..4373fd2 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -530,7 +530,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr,
             }
 
             /* Stopped by walls/doors */
-            if (!cave_have_flag_bold(shooter_ptr->current_floor_ptr, ny, nx, FF_PROJECT) && !shooter_ptr->current_floor_ptr->grid_array[ny][nx].m_idx)
+            if (!cave_has_flag_bold(shooter_ptr->current_floor_ptr, ny, nx, FF_PROJECT) && !shooter_ptr->current_floor_ptr->grid_array[ny][nx].m_idx)
                 break;
 
             /* Advance the distance */
@@ -832,7 +832,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr,
 
             /* Carry object */
             m_ptr->hold_o_idx = o_idx;
-        } else if (cave_have_flag_bold(shooter_ptr->current_floor_ptr, y, x, FF_PROJECT)) {
+        } else if (cave_has_flag_bold(shooter_ptr->current_floor_ptr, y, x, FF_PROJECT)) {
             /* Drop (or break) near that location */
             (void)drop_near(shooter_ptr, q_ptr, j, y, x);
         } else {

diff --git a/src/dungeon/quest-completion-checker.c b/src/dungeon/quest-completion-checker.c
index 7cc8ace..edaf8da 100644 (file)
--- a/src/dungeon/quest-completion-checker.c
+++ b/src/dungeon/quest-completion-checker.c
@@ -154,7 +154,7 @@ void check_quest_completion(player_type *player_ptr, monster_type *m_ptr)
 
     if (create_stairs) {
         POSITION ny, nx;
-        while (cave_have_flag_bold(floor_ptr, y, x, FF_PERMANENT) || floor_ptr->grid_array[y][x].o_idx || (floor_ptr->grid_array[y][x].info & CAVE_OBJECT)) {
+        while (cave_has_flag_bold(floor_ptr, y, x, FF_PERMANENT) || floor_ptr->grid_array[y][x].o_idx || (floor_ptr->grid_array[y][x].info & CAVE_OBJECT)) {
             scatter(player_ptr, &ny, &nx, y, x, 1, PROJECT_NONE);
             y = ny;
             x = nx;

diff --git a/src/dungeon/quest.c b/src/dungeon/quest.c
index a5fd7e0..834b970 100644 (file)
--- a/src/dungeon/quest.c
+++ b/src/dungeon/quest.c
@@ -318,7 +318,7 @@ void do_cmd_quest(player_type *player_ptr)
 
     take_turn(player_ptr, 100);
 
-    if (!cave_have_flag_bold(player_ptr->current_floor_ptr, player_ptr->y, player_ptr->x, FF_QUEST_ENTER)) {
+    if (!cave_has_flag_bold(player_ptr->current_floor_ptr, player_ptr->y, player_ptr->x, FF_QUEST_ENTER)) {
         msg_print(_("ここにはクエストの入口はない。", "You see no quest level here."));
         return;
     }

diff --git a/src/effect/effect-processor.c b/src/effect/effect-processor.c
index 5d4a400..e4d5e95 100644 (file)
--- a/src/effect/effect-processor.c
+++ b/src/effect/effect-processor.c
@@ -317,7 +317,7 @@ bool project(player_type *caster_ptr, const MONSTER_IDX who, POSITION rad, POSIT
 
             if (affect_item(caster_ptr, 0, 0, y, x, dam, GF_SUPER_RAY))
                 notice = TRUE;
-            if (!cave_have_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT)) {
+            if (!cave_has_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT)) {
                 if (second_step)
                     continue;
                 break;
@@ -385,7 +385,7 @@ bool project(player_type *caster_ptr, const MONSTER_IDX who, POSITION rad, POSIT
             if (!cave_los_bold(caster_ptr->current_floor_ptr, ny, nx) && (rad > 0))
                 break;
         } else {
-            if (!cave_have_flag_bold(caster_ptr->current_floor_ptr, ny, nx, FF_PROJECT) && (rad > 0))
+            if (!cave_has_flag_bold(caster_ptr->current_floor_ptr, ny, nx, FF_PROJECT) && (rad > 0))
                 break;
         }
 

diff --git a/src/floor/cave.c b/src/floor/cave.c
index 62bb673..63d9990 100644 (file)
--- a/src/floor/cave.c
+++ b/src/floor/cave.c
@@ -40,7 +40,7 @@ bool in_bounds2u(floor_type *floor_ptr, POSITION y, POSITION x) { return (y < fl
 bool is_cave_empty_bold(player_type *player_ptr, POSITION y, POSITION x)
 {
     floor_type *floor_ptr = player_ptr->current_floor_ptr;
-    bool is_empty_grid = cave_have_flag_bold(floor_ptr, y, x, FF_PLACE);
+    bool is_empty_grid = cave_has_flag_bold(floor_ptr, y, x, FF_PLACE);
     is_empty_grid &= !(floor_ptr->grid_array[y][x].m_idx);
     is_empty_grid &= !player_bold(player_ptr, y, x);
     return is_empty_grid;
@@ -56,11 +56,11 @@ bool is_cave_empty_bold(player_type *player_ptr, POSITION y, POSITION x)
 bool is_cave_empty_bold2(player_type *player_ptr, POSITION y, POSITION x)
 {
     bool is_empty_grid = is_cave_empty_bold(player_ptr, y, x);
-    is_empty_grid &= current_world_ptr->character_dungeon || !cave_have_flag_bold(player_ptr->current_floor_ptr, y, x, FF_TREE);
+    is_empty_grid &= current_world_ptr->character_dungeon || !cave_has_flag_bold(player_ptr->current_floor_ptr, y, x, FF_TREE);
     return is_empty_grid;
 }
 
-bool cave_have_flag_bold(floor_type *floor_ptr, POSITION y, POSITION x, feature_flag_type f_idx)
+bool cave_has_flag_bold(floor_type *floor_ptr, POSITION y, POSITION x, feature_flag_type f_idx)
 {
     return has_flag(f_info[floor_ptr->grid_array[y][x].feat].flags, f_idx);
 }
@@ -83,8 +83,8 @@ bool player_bold(player_type *player_ptr, POSITION y, POSITION x) { return (y ==
  */
 bool cave_stop_disintegration(floor_type *floor_ptr, POSITION y, POSITION x)
 {
-    return !cave_have_flag_bold(floor_ptr, y, x, FF_PROJECT)
-        && (!cave_have_flag_bold(floor_ptr, y, x, FF_HURT_DISI) || cave_have_flag_bold(floor_ptr, y, x, FF_PERMANENT));
+    return !cave_has_flag_bold(floor_ptr, y, x, FF_PROJECT)
+        && (!cave_has_flag_bold(floor_ptr, y, x, FF_HURT_DISI) || cave_has_flag_bold(floor_ptr, y, x, FF_PERMANENT));
 }
 
 /*
@@ -115,7 +115,7 @@ bool cave_have_flag_grid(grid_type *grid_ptr, int feature_flags) { return has_fl
  */
 bool cave_clean_bold(floor_type *floor_ptr, POSITION y, POSITION x)
 {
-    return cave_have_flag_bold(floor_ptr, y, x, FF_FLOOR) && ((floor_ptr->grid_array[y][x].info & CAVE_OBJECT) == 0)
+    return cave_has_flag_bold(floor_ptr, y, x, FF_FLOOR) && ((floor_ptr->grid_array[y][x].info & CAVE_OBJECT) == 0)
         && (floor_ptr->grid_array[y][x].o_idx == 0);
 }
 
@@ -127,7 +127,7 @@ bool cave_clean_bold(floor_type *floor_ptr, POSITION y, POSITION x)
  */
 bool cave_drop_bold(floor_type *floor_ptr, POSITION y, POSITION x)
 {
-    return cave_have_flag_bold(floor_ptr, y, x, FF_DROP) && ((floor_ptr->grid_array[y][x].info & CAVE_OBJECT) == 0);
+    return cave_has_flag_bold(floor_ptr, y, x, FF_DROP) && ((floor_ptr->grid_array[y][x].info & CAVE_OBJECT) == 0);
 }
 
-bool pattern_tile(floor_type *floor_ptr, POSITION y, POSITION x) { return cave_have_flag_bold(floor_ptr, y, x, FF_PATTERN); }
+bool pattern_tile(floor_type *floor_ptr, POSITION y, POSITION x) { return cave_has_flag_bold(floor_ptr, y, x, FF_PATTERN); }

diff --git a/src/floor/cave.h b/src/floor/cave.h
index b0fcdc6..c881859 100644 (file)
--- a/src/floor/cave.h
+++ b/src/floor/cave.h
@@ -9,7 +9,7 @@ bool in_bounds2(floor_type *floor_ptr, POSITION y, POSITION x);
 bool in_bounds2u(floor_type *floor_ptr, POSITION y, POSITION x);
 bool is_cave_empty_bold(player_type *player_ptr, POSITION x, POSITION y);
 bool is_cave_empty_bold2(player_type *player_ptr, POSITION x, POSITION y);
-bool cave_have_flag_bold(floor_type *floor_ptr, POSITION y, POSITION x, feature_flag_type f_idx);
+bool cave_has_flag_bold(floor_type *floor_ptr, POSITION y, POSITION x, feature_flag_type f_idx);
 bool player_has_los_bold(player_type *player_ptr, POSITION y, POSITION x);
 bool player_bold(player_type *player_ptr, POSITION y, POSITION x);
 bool cave_stop_disintegration(floor_type *floor_ptr, POSITION y, POSITION x);

diff --git a/src/grid/feature-generator.c b/src/grid/feature-generator.c
index 525ef96..4c448a0 100644 (file)
--- a/src/grid/feature-generator.c
+++ b/src/grid/feature-generator.c
@@ -139,10 +139,10 @@ static bool possible_doorway(floor_type *floor_ptr, POSITION y, POSITION x)
     if (next_to_corr(floor_ptr, y, x) < 2)
         return FALSE;
 
-    if (cave_have_flag_bold(floor_ptr, y - 1, x, FF_WALL) && cave_have_flag_bold(floor_ptr, y + 1, x, FF_WALL))
+    if (cave_has_flag_bold(floor_ptr, y - 1, x, FF_WALL) && cave_has_flag_bold(floor_ptr, y + 1, x, FF_WALL))
         return TRUE;
 
-    if (cave_have_flag_bold(floor_ptr, y, x - 1, FF_WALL) && cave_have_flag_bold(floor_ptr, y, x + 1, FF_WALL))
+    if (cave_has_flag_bold(floor_ptr, y, x - 1, FF_WALL) && cave_has_flag_bold(floor_ptr, y, x + 1, FF_WALL))
         return TRUE;
 
     return FALSE;
@@ -158,7 +158,7 @@ static bool possible_doorway(floor_type *floor_ptr, POSITION y, POSITION x)
 void try_door(player_type *player_ptr, dt_type *dt_ptr, POSITION y, POSITION x)
 {
     floor_type *floor_ptr = player_ptr->current_floor_ptr;
-    if (!in_bounds(floor_ptr, y, x) || cave_have_flag_bold(floor_ptr, y, x, FF_WALL) || ((floor_ptr->grid_array[y][x].info & CAVE_ROOM) != 0))
+    if (!in_bounds(floor_ptr, y, x) || cave_has_flag_bold(floor_ptr, y, x, FF_WALL) || ((floor_ptr->grid_array[y][x].info & CAVE_ROOM) != 0))
         return;
 
     bool can_place_door = randint0(100) < dt_ptr->dun_tun_jct;

diff --git a/src/grid/feature.c b/src/grid/feature.c
index da6832c..a546077 100644 (file)
--- a/src/grid/feature.c
+++ b/src/grid/feature.c
@@ -211,7 +211,7 @@ void cave_set_feat(player_type *player_ptr, POSITION y, POSITION x, FEAT_IDX fea
         return;
     }
 
-    bool old_los = cave_have_flag_bold(floor_ptr, y, x, FF_LOS);
+    bool old_los = cave_has_flag_bold(floor_ptr, y, x, FF_LOS);
     bool old_mirror = is_mirror_grid(g_ptr);
 
     g_ptr->mimic = 0;

diff --git a/src/monster-floor/monster-lite.c b/src/monster-floor/monster-lite.c
index 4de0a14..5221719 100644 (file)
--- a/src/monster-floor/monster-lite.c
+++ b/src/monster-floor/monster-lite.c
@@ -88,10 +88,10 @@ static void update_monster_dark(player_type *subject_ptr, const POSITION y, cons
             d = y - ml_ptr->mon_fy;
             midpoint = ml_ptr->mon_fx + ((subject_ptr->x - ml_ptr->mon_fx) * ABS(d)) / ABS(dpf);
             if (x < midpoint) {
-                if (!cave_los_bold(subject_ptr->current_floor_ptr, y, x + 1) && !cave_have_flag_bold(subject_ptr->current_floor_ptr, y, x + 1, FF_PROJECT))
+                if (!cave_los_bold(subject_ptr->current_floor_ptr, y, x + 1) && !cave_has_flag_bold(subject_ptr->current_floor_ptr, y, x + 1, FF_PROJECT))
                     return;
             } else if (x > midpoint) {
-                if (!cave_los_bold(subject_ptr->current_floor_ptr, y, x - 1) && !cave_have_flag_bold(subject_ptr->current_floor_ptr, y, x - 1, FF_PROJECT))
+                if (!cave_los_bold(subject_ptr->current_floor_ptr, y, x - 1) && !cave_has_flag_bold(subject_ptr->current_floor_ptr, y, x - 1, FF_PROJECT))
                     return;
             } else if (ml_ptr->mon_invis)
                 return;
@@ -102,10 +102,10 @@ static void update_monster_dark(player_type *subject_ptr, const POSITION y, cons
             d = x - ml_ptr->mon_fx;
             midpoint = ml_ptr->mon_fy + ((subject_ptr->y - ml_ptr->mon_fy) * ABS(d)) / ABS(dpf);
             if (y < midpoint) {
-                if (!cave_los_bold(subject_ptr->current_floor_ptr, y + 1, x) && !cave_have_flag_bold(subject_ptr->current_floor_ptr, y + 1, x, FF_PROJECT))
+                if (!cave_los_bold(subject_ptr->current_floor_ptr, y + 1, x) && !cave_has_flag_bold(subject_ptr->current_floor_ptr, y + 1, x, FF_PROJECT))
                     return;
             } else if (y > midpoint) {
-                if (!cave_los_bold(subject_ptr->current_floor_ptr, y - 1, x) && !cave_have_flag_bold(subject_ptr->current_floor_ptr, y - 1, x, FF_PROJECT))
+                if (!cave_los_bold(subject_ptr->current_floor_ptr, y - 1, x) && !cave_has_flag_bold(subject_ptr->current_floor_ptr, y - 1, x, FF_PROJECT))
                     return;
             } else if (ml_ptr->mon_invis)
                 return;
@@ -198,7 +198,7 @@ void update_mon_lite(player_type *subject_ptr)
                 continue;
 
             grid_type *g_ptr;
-            if (cave_have_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy + 1, ml_ptr->mon_fx, f_flag)) {
+            if (cave_has_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy + 1, ml_ptr->mon_fx, f_flag)) {
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy + 2, ml_ptr->mon_fx + 1, ml_ptr);
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy + 2, ml_ptr->mon_fx, ml_ptr);
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy + 2, ml_ptr->mon_fx - 1, ml_ptr);
@@ -210,7 +210,7 @@ void update_mon_lite(player_type *subject_ptr)
                 }
             }
 
-            if (cave_have_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy - 1, ml_ptr->mon_fx, f_flag)) {
+            if (cave_has_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy - 1, ml_ptr->mon_fx, f_flag)) {
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy - 2, ml_ptr->mon_fx + 1, ml_ptr);
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy - 2, ml_ptr->mon_fx, ml_ptr);
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy - 2, ml_ptr->mon_fx - 1, ml_ptr);
@@ -222,7 +222,7 @@ void update_mon_lite(player_type *subject_ptr)
                 }
             }
 
-            if (cave_have_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy, ml_ptr->mon_fx + 1, f_flag)) {
+            if (cave_has_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy, ml_ptr->mon_fx + 1, f_flag)) {
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy + 1, ml_ptr->mon_fx + 2, ml_ptr);
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy, ml_ptr->mon_fx + 2, ml_ptr);
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy - 1, ml_ptr->mon_fx + 2, ml_ptr);
@@ -234,7 +234,7 @@ void update_mon_lite(player_type *subject_ptr)
                 }
             }
 
-            if (cave_have_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy, ml_ptr->mon_fx - 1, f_flag)) {
+            if (cave_has_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy, ml_ptr->mon_fx - 1, f_flag)) {
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy + 1, ml_ptr->mon_fx - 2, ml_ptr);
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy, ml_ptr->mon_fx - 2, ml_ptr);
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy - 1, ml_ptr->mon_fx - 2, ml_ptr);
@@ -249,16 +249,16 @@ void update_mon_lite(player_type *subject_ptr)
             if (rad != 3)
                 continue;
 
-            if (cave_have_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy + 1, ml_ptr->mon_fx + 1, f_flag))
+            if (cave_has_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy + 1, ml_ptr->mon_fx + 1, f_flag))
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy + 2, ml_ptr->mon_fx + 2, ml_ptr);
 
-            if (cave_have_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy + 1, ml_ptr->mon_fx - 1, f_flag))
+            if (cave_has_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy + 1, ml_ptr->mon_fx - 1, f_flag))
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy + 2, ml_ptr->mon_fx - 2, ml_ptr);
 
-            if (cave_have_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy - 1, ml_ptr->mon_fx + 1, f_flag))
+            if (cave_has_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy - 1, ml_ptr->mon_fx + 1, f_flag))
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy - 2, ml_ptr->mon_fx + 2, ml_ptr);
 
-            if (cave_have_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy - 1, ml_ptr->mon_fx - 1, f_flag))
+            if (cave_has_flag_bold(subject_ptr->current_floor_ptr, ml_ptr->mon_fy - 1, ml_ptr->mon_fx - 1, f_flag))
                 add_mon_lite(subject_ptr, ml_ptr->mon_fy - 2, ml_ptr->mon_fx - 2, ml_ptr);
         }
     }

diff --git a/src/mspell/mspell-judgement.c b/src/mspell/mspell-judgement.c
index 044d3e3..a6ffd60 100644 (file)
--- a/src/mspell/mspell-judgement.c
+++ b/src/mspell/mspell-judgement.c
@@ -115,7 +115,7 @@ bool breath_direct(player_type *master_ptr, POSITION y1, POSITION x1, POSITION y
             if (!cave_los_bold(master_ptr->current_floor_ptr, ny, nx))
                 break;
         } else {
-            if (!cave_have_flag_bold(master_ptr->current_floor_ptr, ny, nx, FF_PROJECT))
+            if (!cave_has_flag_bold(master_ptr->current_floor_ptr, ny, nx, FF_PROJECT))
                 break;
         }
 
@@ -188,7 +188,7 @@ void get_project_point(player_type *target_ptr, POSITION sy, POSITION sx, POSITI
     for (int i = 0; i < path_n; i++) {
         sy = get_grid_y(path_g[i]);
         sx = get_grid_x(path_g[i]);
-        if (!cave_have_flag_bold(target_ptr->current_floor_ptr, sy, sx, FF_PROJECT))
+        if (!cave_has_flag_bold(target_ptr->current_floor_ptr, sy, sx, FF_PROJECT))
             break;
 
         *ty = sy;

diff --git a/src/object-activation/activation-bolt-ball.c b/src/object-activation/activation-bolt-ball.c
index 8876fc3..f917216 100644 (file)
--- a/src/object-activation/activation-bolt-ball.c
+++ b/src/object-activation/activation-bolt-ball.c
@@ -310,7 +310,7 @@ bool activate_ball_lite(player_type *user_ptr, concptr name)
         int attempts = 1000;
         while (attempts--) {
             scatter(user_ptr, &y, &x, user_ptr->y, user_ptr->x, 4, PROJECT_NONE);
-            if (!cave_have_flag_bold(user_ptr->current_floor_ptr, y, x, FF_PROJECT))
+            if (!cave_has_flag_bold(user_ptr->current_floor_ptr, y, x, FF_PROJECT))
                 continue;
 
             if (!player_bold(user_ptr, y, x))

diff --git a/src/player-attack/player-attack.c b/src/player-attack/player-attack.c
index b08edbd..1598260 100644 (file)
--- a/src/player-attack/player-attack.c
+++ b/src/player-attack/player-attack.c
@@ -497,7 +497,7 @@ void massacre(player_type *caster_ptr)
         POSITION x = caster_ptr->x + ddx_ddd[dir];
         g_ptr = &caster_ptr->current_floor_ptr->grid_array[y][x];
         m_ptr = &caster_ptr->current_floor_ptr->m_list[g_ptr->m_idx];
-        if (g_ptr->m_idx && (m_ptr->ml || cave_have_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT)))
+        if (g_ptr->m_idx && (m_ptr->ml || cave_has_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT)))
             do_cmd_attack(caster_ptr, y, x, 0);
     }
 }

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 0ecee79..ad0dca6 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -419,7 +419,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type m
             if (caster_ptr->current_floor_ptr->grid_array[y][x].m_idx)
                 do_cmd_attack(caster_ptr, y, x, HISSATSU_HAGAN);
 
-            if (!cave_have_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_HURT_ROCK))
+            if (!cave_has_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_HURT_ROCK))
                 break;
 
             /* Destroy the feature */
@@ -599,7 +599,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type m
                 m_ptr = &caster_ptr->current_floor_ptr->m_list[g_ptr->m_idx];
 
                 /* Hack -- attack monsters */
-                if (g_ptr->m_idx && (m_ptr->ml || cave_have_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT))) {
+                if (g_ptr->m_idx && (m_ptr->ml || cave_has_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT))) {
                     if (!monster_living(m_ptr->r_idx)) {
                         GAME_TEXT m_name[MAX_NLEN];
 
@@ -953,7 +953,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type m
                 damage *= caster_ptr->num_blow[i];
                 total_damage += (damage / 100);
             }
-            project(caster_ptr, 0, (cave_have_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT) ? 5 : 0), y, x, total_damage * 3 / 2, GF_METEOR,
+            project(caster_ptr, 0, (cave_has_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT) ? 5 : 0), y, x, total_damage * 3 / 2, GF_METEOR,
                 PROJECT_KILL | PROJECT_JUMP | PROJECT_ITEM, -1);
         }
         break;

diff --git a/src/room/cave-filler.c b/src/room/cave-filler.c
index 2c0eef8..94daf21 100644 (file)
--- a/src/room/cave-filler.c
+++ b/src/room/cave-filler.c
@@ -475,7 +475,7 @@ bool generate_lake(player_type *player_ptr, POSITION y0, POSITION x0, POSITION x
                 place_bold(player_ptr, y0 + y - yhsize, x0 + x - xhsize, GB_EXTRA);
 
             floor_ptr->grid_array[y0 + y - yhsize][x0 + x - xhsize].info &= ~(CAVE_ICKY | CAVE_ROOM);
-            if (cave_have_flag_bold(floor_ptr, y0 + y - yhsize, x0 + x - xhsize, FF_LAVA)) {
+            if (cave_has_flag_bold(floor_ptr, y0 + y - yhsize, x0 + x - xhsize, FF_LAVA)) {
                 if (!(d_info[floor_ptr->dungeon_idx].flags1 & DF1_DARKNESS))
                     floor_ptr->grid_array[y0 + y - yhsize][x0 + x - xhsize].info |= CAVE_GLOW;
             }

diff --git a/src/room/treasure-deployment.c b/src/room/treasure-deployment.c
index 81ae14f..476cfab 100644 (file)
--- a/src/room/treasure-deployment.c
+++ b/src/room/treasure-deployment.c
@@ -30,7 +30,7 @@ void fill_treasure(player_type *player_ptr, POSITION x1, POSITION x2, POSITION y
             if ((randint1(100) - difficulty * 3) > 50)
                 value = 20;
 
-            if (!is_floor_bold(floor_ptr, y, x) && (!cave_have_flag_bold(floor_ptr, y, x, FF_PLACE) || !cave_have_flag_bold(floor_ptr, y, x, FF_DROP)))
+            if (!is_floor_bold(floor_ptr, y, x) && (!cave_has_flag_bold(floor_ptr, y, x, FF_PLACE) || !cave_has_flag_bold(floor_ptr, y, x, FF_DROP)))
                 continue;
 
             if (value < 0) {

diff --git a/src/spell-kind/earthquake.c b/src/spell-kind/earthquake.c
index 23b336d..6fd219b 100644 (file)
--- a/src/spell-kind/earthquake.c
+++ b/src/spell-kind/earthquake.c
@@ -282,7 +282,7 @@ bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, M
                 continue;
 
             delete_all_items_from_floor(caster_ptr, yy, xx);
-            int t = cave_have_flag_bold(floor_ptr, yy, xx, FF_PROJECT) ? randint0(100) : 200;
+            int t = cave_has_flag_bold(floor_ptr, yy, xx, FF_PROJECT) ? randint0(100) : 200;
             if (t < 20) {
                 cave_set_feat(caster_ptr, yy, xx, feat_granite);
                 continue;

diff --git a/src/spell-kind/spells-fetcher.c b/src/spell-kind/spells-fetcher.c
index 1dc3757..06119c8 100644 (file)
--- a/src/spell-kind/spells-fetcher.c
+++ b/src/spell-kind/spells-fetcher.c
@@ -83,7 +83,7 @@ void fetch_item(player_type *caster_ptr, DIRECTION dir, WEIGHT wgt, bool require
             g_ptr = &caster_ptr->current_floor_ptr->grid_array[ty][tx];
 
             if ((distance(caster_ptr->y, caster_ptr->x, ty, tx) > get_max_range(caster_ptr))
-                || !cave_have_flag_bold(caster_ptr->current_floor_ptr, ty, tx, FF_PROJECT))
+                || !cave_has_flag_bold(caster_ptr->current_floor_ptr, ty, tx, FF_PROJECT))
                 return;
         }
     }

diff --git a/src/spell-kind/spells-lite.c b/src/spell-kind/spells-lite.c
index 913acf5..4d7b756 100644 (file)
--- a/src/spell-kind/spells-lite.c
+++ b/src/spell-kind/spells-lite.c
@@ -255,7 +255,7 @@ static void cave_temp_lite_room_aux(player_type *caster_ptr, POSITION y, POSITIO
  * @param x 指定X座標
  * @return 射線を通すならばtrueを返す。
  */
-static bool cave_pass_dark_bold(floor_type *floor_ptr, POSITION y, POSITION x) { return cave_have_flag_bold(floor_ptr, y, x, FF_PROJECT); }
+static bool cave_pass_dark_bold(floor_type *floor_ptr, POSITION y, POSITION x) { return cave_has_flag_bold(floor_ptr, y, x, FF_PROJECT); }
 
 /*!
  * @brief 部屋内にある一点の周囲がいくつ射線を通すかをグローバル変数tmp_pos.nに返す / Aux function -- see below
@@ -352,7 +352,7 @@ bool starlight(player_type *caster_ptr, bool magic)
 
         while (attempts--) {
             scatter(caster_ptr, &y, &x, caster_ptr->y, caster_ptr->x, 4, PROJECT_LOS);
-            if (!cave_have_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT))
+            if (!cave_has_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT))
                 continue;
             if (!player_bold(caster_ptr, y, x))
                 break;

diff --git a/src/spell-kind/spells-neighbor.c b/src/spell-kind/spells-neighbor.c
index 834f433..e736f1b 100644 (file)
--- a/src/spell-kind/spells-neighbor.c
+++ b/src/spell-kind/spells-neighbor.c
@@ -131,7 +131,7 @@ void wall_breaker(player_type *caster_ptr)
         while (attempts--) {
             scatter(caster_ptr, &y, &x, caster_ptr->y, caster_ptr->x, 4, PROJECT_NONE);
 
-            if (!cave_have_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT))
+            if (!cave_has_flag_bold(caster_ptr->current_floor_ptr, y, x, FF_PROJECT))
                 continue;
 
             if (!player_bold(caster_ptr, y, x))

diff --git a/src/spell-realm/spells-chaos.c b/src/spell-realm/spells-chaos.c
index eaea194..731cbe5 100644 (file)
--- a/src/spell-realm/spells-chaos.c
+++ b/src/spell-realm/spells-chaos.c
@@ -210,7 +210,7 @@ void cast_meteor(player_type *caster_ptr, HIT_POINT dam, POSITION rad)
 
             floor_type *floor_ptr = caster_ptr->current_floor_ptr;
             if (!in_bounds(floor_ptr, y, x) || !projectable(caster_ptr, caster_ptr->y, caster_ptr->x, y, x)
-                || !cave_have_flag_bold(floor_ptr, y, x, FF_PROJECT))
+                || !cave_has_flag_bold(floor_ptr, y, x, FF_PROJECT))
                 continue;
 
             break;

diff --git a/src/spell-realm/spells-crusade.c b/src/spell-realm/spells-crusade.c
index ff0523e..c9d7c48 100644 (file)
--- a/src/spell-realm/spells-crusade.c
+++ b/src/spell-realm/spells-crusade.c
@@ -57,7 +57,7 @@ bool cast_wrath_of_the_god(player_type *caster_ptr, HIT_POINT dam, POSITION rad)
         mmove2(&ny, &nx, caster_ptr->y, caster_ptr->x, ty, tx);
         if (get_max_range(caster_ptr) <= distance(caster_ptr->y, caster_ptr->x, ny, nx))
             break;
-        if (!cave_have_flag_bold(caster_ptr->current_floor_ptr, ny, nx, FF_PROJECT))
+        if (!cave_has_flag_bold(caster_ptr->current_floor_ptr, ny, nx, FF_PROJECT))
             break;
         if ((dir != 5) && caster_ptr->current_floor_ptr->grid_array[ny][nx].m_idx != 0)
             break;

diff --git a/src/spell/spells-status.c b/src/spell/spells-status.c
index 88cb296..8462a82 100644 (file)
--- a/src/spell/spells-status.c
+++ b/src/spell/spells-status.c
@@ -439,7 +439,7 @@ bool fishing(player_type *creature_ptr)
     POSITION y = creature_ptr->y + ddy[dir];
     POSITION x = creature_ptr->x + ddx[dir];
     creature_ptr->fishing_dir = dir;
-    if (!cave_have_flag_bold(creature_ptr->current_floor_ptr, y, x, FF_WATER)) {
+    if (!cave_has_flag_bold(creature_ptr->current_floor_ptr, y, x, FF_WATER)) {
         msg_print(_("そこは水辺ではない。", "There is no fishing place."));
         return FALSE;
     }

diff --git a/src/target/projection-path-calculator.c b/src/target/projection-path-calculator.c
index 3667e6d..2c50c10 100644 (file)
--- a/src/target/projection-path-calculator.c
+++ b/src/target/projection-path-calculator.c
@@ -106,7 +106,7 @@ static void calc_projection_to_target(player_type *player_ptr, projection_path_t
             if ((pp_ptr->n > 0) && !cave_los_bold(floor_ptr, pp_ptr->y, pp_ptr->x))
                 break;
         } else if (!(pp_ptr->flag & PROJECT_PATH)) {
-            if ((pp_ptr->n > 0) && !cave_have_flag_bold(floor_ptr, pp_ptr->y, pp_ptr->x, FF_PROJECT))
+            if ((pp_ptr->n > 0) && !cave_has_flag_bold(floor_ptr, pp_ptr->y, pp_ptr->x, FF_PROJECT))
                 break;
         }
 
@@ -182,7 +182,7 @@ static void calc_projection_others(player_type *player_ptr, projection_path_type
             if ((pp_ptr->n > 0) && !cave_los_bold(floor_ptr, pp_ptr->y, pp_ptr->x))
                 break;
         } else if (!(pp_ptr->flag & PROJECT_PATH)) {
-            if ((pp_ptr->n > 0) && !cave_have_flag_bold(floor_ptr, pp_ptr->y, pp_ptr->x, FF_PROJECT))
+            if ((pp_ptr->n > 0) && !cave_has_flag_bold(floor_ptr, pp_ptr->y, pp_ptr->x, FF_PROJECT))
                 break;
         }