From 212f4ca440c0d86ff7f2f7cacb7778959052d9e5 Mon Sep 17 00:00:00 2001 From: deskull Date: Thu, 27 Aug 2020 01:12:03 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20cave=5Fhave=5Fflag=5Fgrid()=20?= =?utf8?q?=E3=82=92=20cave=5Fhas=5Fflag=5Fgrid()=E3=80=80=E3=81=AB?= =?utf8?q?=E6=94=B9=E5=90=8D.=20/=20Rename=20cave=5Fhave=5Fflag=5Fgrid()?= =?utf8?q?=20to=20cave=5Fhas=5Fflag=5Fgrid().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/action/tunnel-execution.c | 2 +- src/cmd-building/cmd-store.c | 2 +- src/combat/shoot.c | 2 +- src/floor/cave.c | 2 +- src/floor/cave.h | 2 +- src/floor/floor-streams.c | 4 ++-- src/floor/floor-util.c | 2 +- src/floor/wild.c | 2 +- src/grid/feature-generator.c | 2 +- src/grid/grid.c | 6 +++--- src/grid/stair.c | 2 +- src/grid/trap.c | 2 +- src/io/cursor.c | 2 +- src/mind/mind-archer.c | 2 +- src/monster-floor/monster-lite.c | 10 +++++----- src/mspell/mspell-lite.c | 2 +- src/pet/pet-fall-off.c | 4 ++-- src/room/vault-builder.c | 2 +- src/spell-kind/spells-detection.c | 2 +- src/spell-kind/spells-floor.c | 2 +- src/spell-realm/spells-chaos.c | 2 +- src/target/grid-selector.c | 6 +++--- 22 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/action/tunnel-execution.c b/src/action/tunnel-execution.c index 1cb36e10e..4765ce623 100644 --- a/src/action/tunnel-execution.c +++ b/src/action/tunnel-execution.c @@ -26,7 +26,7 @@ static bool do_cmd_tunnel_test(floor_type *floor_ptr, POSITION y, POSITION x) return FALSE; } - if (!cave_have_flag_grid(g_ptr, FF_TUNNEL)) { + if (!cave_has_flag_grid(g_ptr, FF_TUNNEL)) { msg_print(_("そこには掘るものが見当たらない。", "You see nothing there to tunnel.")); return FALSE; } diff --git a/src/cmd-building/cmd-store.c b/src/cmd-building/cmd-store.c index 18a0ac9c8..9e3e53be1 100644 --- a/src/cmd-building/cmd-store.c +++ b/src/cmd-building/cmd-store.c @@ -60,7 +60,7 @@ void do_cmd_store(player_type *player_ptr) grid_type *g_ptr; g_ptr = &player_ptr->current_floor_ptr->grid_array[player_ptr->y][player_ptr->x]; - if (!cave_have_flag_grid(g_ptr, FF_STORE)) { + if (!cave_has_flag_grid(g_ptr, FF_STORE)) { msg_print(_("ここには店がありません。", "You see no store here.")); return; } diff --git a/src/combat/shoot.c b/src/combat/shoot.c index 4373fd288..fe4e969ee 100644 --- a/src/combat/shoot.c +++ b/src/combat/shoot.c @@ -514,7 +514,7 @@ void exe_fire(player_type *shooter_ptr, INVENTORY_IDX item, object_type *j_ptr, if (snipe_type == SP_KILL_WALL) { g_ptr = &shooter_ptr->current_floor_ptr->grid_array[ny][nx]; - if (cave_have_flag_grid(g_ptr, FF_HURT_ROCK) && !g_ptr->m_idx) { + if (cave_has_flag_grid(g_ptr, FF_HURT_ROCK) && !g_ptr->m_idx) { if (g_ptr->info & (CAVE_MARK)) msg_print(_("岩が砕け散った。", "Wall rocks were shattered.")); /* Forget the wall */ diff --git a/src/floor/cave.c b/src/floor/cave.c index 63d99901a..9789ccda4 100644 --- a/src/floor/cave.c +++ b/src/floor/cave.c @@ -103,7 +103,7 @@ bool feat_supports_los(FEAT_IDX f_idx) { return has_flag(f_info[f_idx].flags, FF bool cave_los_grid(grid_type *grid_ptr) { return feat_supports_los(grid_ptr->feat); } -bool cave_have_flag_grid(grid_type *grid_ptr, int feature_flags) { return has_flag(f_info[grid_ptr->feat].flags, feature_flags); } +bool cave_has_flag_grid(grid_type *grid_ptr, int feature_flags) { return has_flag(f_info[grid_ptr->feat].flags, feature_flags); } /* * Determine if a "legal" grid is a "clean" floor grid diff --git a/src/floor/cave.h b/src/floor/cave.h index c88185906..a789de6d9 100644 --- a/src/floor/cave.h +++ b/src/floor/cave.h @@ -16,7 +16,7 @@ bool cave_stop_disintegration(floor_type *floor_ptr, POSITION y, POSITION x); bool cave_los_bold(floor_type *floor_ptr, POSITION y, POSITION x); bool feat_supports_los(FEAT_IDX f_idx); bool cave_los_grid(grid_type *grid_ptr); -bool cave_have_flag_grid(grid_type *grid_ptr, int feature_flags); +bool cave_has_flag_grid(grid_type *grid_ptr, int feature_flags); bool cave_clean_bold(floor_type *floor_ptr, POSITION y, POSITION x); bool cave_drop_bold(floor_type *floor_ptr, POSITION y, POSITION x); bool pattern_tile(floor_type *floor_ptr, POSITION y, POSITION x); diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c index bdf81ef81..4c6fa0d37 100644 --- a/src/floor/floor-streams.c +++ b/src/floor/floor-streams.c @@ -120,7 +120,7 @@ static void recursive_river(floor_type *floor_ptr, POSITION x1, POSITION y1, POS continue; /* Do not convert permanent features */ - if (cave_have_flag_grid(g_ptr, FF_PERMANENT)) + if (cave_has_flag_grid(g_ptr, FF_PERMANENT)) continue; /* @@ -434,7 +434,7 @@ void place_trees(player_type *player_ptr, POSITION x, POSITION y) continue; /* Want square to be in the circle and accessable. */ - if ((distance(j, i, y, x) < 4) && !cave_have_flag_grid(g_ptr, FF_PERMANENT)) { + if ((distance(j, i, y, x) < 4) && !cave_has_flag_grid(g_ptr, FF_PERMANENT)) { /* * Clear previous contents, add feature * The border mainly gets trees, while the center gets rubble diff --git a/src/floor/floor-util.c b/src/floor/floor-util.c index 4d0be6c9e..87a485179 100644 --- a/src/floor/floor-util.c +++ b/src/floor/floor-util.c @@ -78,7 +78,7 @@ void update_smell(floor_type *floor_ptr, player_type *subject_ptr) continue; g_ptr = &floor_ptr->grid_array[y][x]; - if (!cave_have_flag_grid(g_ptr, FF_MOVE) && !is_closed_door(subject_ptr, g_ptr->feat)) + if (!cave_has_flag_grid(g_ptr, FF_MOVE) && !is_closed_door(subject_ptr, g_ptr->feat)) continue; if (!player_has_los_bold(subject_ptr, y, x)) continue; diff --git a/src/floor/wild.c b/src/floor/wild.c index 89e0a9f55..1e570a3c5 100644 --- a/src/floor/wild.c +++ b/src/floor/wild.c @@ -516,7 +516,7 @@ void wilderness_gen(player_type *creature_ptr) for (x = 0; x < floor_ptr->width; x++) { grid_type *g_ptr; g_ptr = &floor_ptr->grid_array[y][x]; - if (!cave_have_flag_grid(g_ptr, FF_ENTRANCE)) + if (!cave_has_flag_grid(g_ptr, FF_ENTRANCE)) continue; if (g_ptr->m_idx != 0) diff --git a/src/grid/feature-generator.c b/src/grid/feature-generator.c index 4c448a087..6e9b61402 100644 --- a/src/grid/feature-generator.c +++ b/src/grid/feature-generator.c @@ -118,7 +118,7 @@ static int next_to_corr(floor_type *floor_ptr, POSITION y1, POSITION x1) POSITION x = x1 + ddx_ddd[i]; grid_type *g_ptr; g_ptr = &floor_ptr->grid_array[y][x]; - if (cave_have_flag_grid(g_ptr, FF_WALL) || !is_floor_grid(g_ptr) || ((g_ptr->info & CAVE_ROOM) != 0)) + if (cave_has_flag_grid(g_ptr, FF_WALL) || !is_floor_grid(g_ptr) || ((g_ptr->info & CAVE_ROOM) != 0)) continue; k++; diff --git a/src/grid/grid.c b/src/grid/grid.c index 71b8d2a27..1d29c892c 100644 --- a/src/grid/grid.c +++ b/src/grid/grid.c @@ -281,7 +281,7 @@ void place_bound_perm_wall(player_type *player_ptr, grid_type *g_ptr) */ bool is_known_trap(player_type *player_ptr, grid_type *g_ptr) { - if (!g_ptr->mimic && !cave_have_flag_grid(g_ptr, FF_SECRET) && is_trap(player_ptr, g_ptr->feat)) + if (!g_ptr->mimic && !cave_has_flag_grid(g_ptr, FF_SECRET) && is_trap(player_ptr, g_ptr->feat)) return TRUE; else return FALSE; @@ -295,7 +295,7 @@ bool is_known_trap(player_type *player_ptr, grid_type *g_ptr) */ bool is_hidden_door(player_type *player_ptr, grid_type *g_ptr) { - if ((g_ptr->mimic || cave_have_flag_grid(g_ptr, FF_SECRET)) && is_closed_door(player_ptr, g_ptr->feat)) + if ((g_ptr->mimic || cave_has_flag_grid(g_ptr, FF_SECRET)) && is_closed_door(player_ptr, g_ptr->feat)) return TRUE; else return FALSE; @@ -914,7 +914,7 @@ void update_flow(player_type *subject_ptr) continue; /* Ignore "walls" and "rubble" */ - if (!cave_have_flag_grid(g_ptr, FF_MOVE) && !is_closed_door(subject_ptr, g_ptr->feat)) + if (!cave_has_flag_grid(g_ptr, FF_MOVE) && !is_closed_door(subject_ptr, g_ptr->feat)) continue; /* Save the flow cost */ diff --git a/src/grid/stair.c b/src/grid/stair.c index 165d99e51..a73351c32 100644 --- a/src/grid/stair.c +++ b/src/grid/stair.c @@ -62,7 +62,7 @@ void place_random_stairs(player_type *player_ptr, POSITION y, POSITION x) bool cave_valid_bold(floor_type *floor_ptr, POSITION y, POSITION x) { grid_type *g_ptr = &floor_ptr->grid_array[y][x]; - if (cave_have_flag_grid(g_ptr, FF_PERMANENT)) + if (cave_has_flag_grid(g_ptr, FF_PERMANENT)) return FALSE; OBJECT_IDX next_o_idx = 0; diff --git a/src/grid/trap.c b/src/grid/trap.c index e9fd505ca..23786d418 100644 --- a/src/grid/trap.c +++ b/src/grid/trap.c @@ -199,7 +199,7 @@ void disclose_grid(player_type *trapped_ptr, POSITION y, POSITION x) { grid_type *g_ptr = &trapped_ptr->current_floor_ptr->grid_array[y][x]; - if (cave_have_flag_grid(g_ptr, FF_SECRET)) { + if (cave_has_flag_grid(g_ptr, FF_SECRET)) { /* No longer hidden */ cave_alter_feat(trapped_ptr, y, x, FF_SECRET); } else if (g_ptr->mimic) { diff --git a/src/io/cursor.c b/src/io/cursor.c index fe548fa22..baca2dff6 100644 --- a/src/io/cursor.c +++ b/src/io/cursor.c @@ -81,7 +81,7 @@ void print_path(player_type *player_ptr, POSITION y, POSITION x) term_queue_bigchar(panel_col_of(nx), ny - panel_row_prt, a, c, ta, tc); } - if ((g_ptr->info & CAVE_MARK) && !cave_have_flag_grid(g_ptr, FF_PROJECT)) + if ((g_ptr->info & CAVE_MARK) && !cave_has_flag_grid(g_ptr, FF_PROJECT)) break; if (nx == x && ny == y) diff --git a/src/mind/mind-archer.c b/src/mind/mind-archer.c index 55eb41e5d..174501deb 100644 --- a/src/mind/mind-archer.c +++ b/src/mind/mind-archer.c @@ -86,7 +86,7 @@ bool create_ammo(player_type *creature_ptr) return FALSE; } - if (!cave_have_flag_grid(g_ptr, FF_CAN_DIG) || !cave_have_flag_grid(g_ptr, FF_HURT_ROCK)) { + if (!cave_has_flag_grid(g_ptr, FF_CAN_DIG) || !cave_has_flag_grid(g_ptr, FF_HURT_ROCK)) { msg_print(_("d‚·‚¬‚Ä•ö‚¹‚È‚©‚Á‚½B", "You failed to make ammo.")); return TRUE; } diff --git a/src/monster-floor/monster-lite.c b/src/monster-floor/monster-lite.c index 522171955..22e0c83a5 100644 --- a/src/monster-floor/monster-lite.c +++ b/src/monster-floor/monster-lite.c @@ -82,7 +82,7 @@ static void update_monster_dark(player_type *subject_ptr, const POSITION y, cons if ((g_ptr->info & (CAVE_LITE | CAVE_MNLT | CAVE_MNDK | CAVE_VIEW)) != CAVE_VIEW) return; - if (!cave_los_grid(g_ptr) && !cave_have_flag_grid(g_ptr, FF_PROJECT)) { + if (!cave_los_grid(g_ptr) && !cave_has_flag_grid(g_ptr, FF_PROJECT)) { if (((y < subject_ptr->y) && (y > ml_ptr->mon_fy)) || ((y > subject_ptr->y) && (y < ml_ptr->mon_fy))) { dpf = subject_ptr->y - ml_ptr->mon_fy; d = y - ml_ptr->mon_fy; @@ -203,7 +203,7 @@ void update_mon_lite(player_type *subject_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); g_ptr = &floor_ptr->grid_array[ml_ptr->mon_fy + 2][ml_ptr->mon_fx]; - if ((rad == 3) && cave_have_flag_grid(g_ptr, f_flag)) { + if ((rad == 3) && cave_has_flag_grid(g_ptr, f_flag)) { add_mon_lite(subject_ptr, ml_ptr->mon_fy + 3, ml_ptr->mon_fx + 1, ml_ptr); add_mon_lite(subject_ptr, ml_ptr->mon_fy + 3, ml_ptr->mon_fx, ml_ptr); add_mon_lite(subject_ptr, ml_ptr->mon_fy + 3, ml_ptr->mon_fx - 1, ml_ptr); @@ -215,7 +215,7 @@ void update_mon_lite(player_type *subject_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); g_ptr = &floor_ptr->grid_array[ml_ptr->mon_fy - 2][ml_ptr->mon_fx]; - if ((rad == 3) && cave_have_flag_grid(g_ptr, f_flag)) { + if ((rad == 3) && cave_has_flag_grid(g_ptr, f_flag)) { add_mon_lite(subject_ptr, ml_ptr->mon_fy - 3, ml_ptr->mon_fx + 1, ml_ptr); add_mon_lite(subject_ptr, ml_ptr->mon_fy - 3, ml_ptr->mon_fx, ml_ptr); add_mon_lite(subject_ptr, ml_ptr->mon_fy - 3, ml_ptr->mon_fx - 1, ml_ptr); @@ -227,7 +227,7 @@ void update_mon_lite(player_type *subject_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); g_ptr = &floor_ptr->grid_array[ml_ptr->mon_fy][ml_ptr->mon_fx + 2]; - if ((rad == 3) && cave_have_flag_grid(g_ptr, f_flag)) { + if ((rad == 3) && cave_has_flag_grid(g_ptr, f_flag)) { add_mon_lite(subject_ptr, ml_ptr->mon_fy + 1, ml_ptr->mon_fx + 3, ml_ptr); add_mon_lite(subject_ptr, ml_ptr->mon_fy, ml_ptr->mon_fx + 3, ml_ptr); add_mon_lite(subject_ptr, ml_ptr->mon_fy - 1, ml_ptr->mon_fx + 3, ml_ptr); @@ -239,7 +239,7 @@ void update_mon_lite(player_type *subject_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); g_ptr = &floor_ptr->grid_array[ml_ptr->mon_fy][ml_ptr->mon_fx - 2]; - if ((rad == 3) && cave_have_flag_grid(g_ptr, f_flag)) { + if ((rad == 3) && cave_has_flag_grid(g_ptr, f_flag)) { add_mon_lite(subject_ptr, ml_ptr->mon_fy + 1, ml_ptr->mon_fx - 3, ml_ptr); add_mon_lite(subject_ptr, ml_ptr->mon_fy, ml_ptr->mon_fx - 3, ml_ptr); add_mon_lite(subject_ptr, ml_ptr->mon_fy - 1, ml_ptr->mon_fx - 3, ml_ptr); diff --git a/src/mspell/mspell-lite.c b/src/mspell/mspell-lite.c index ba963be43..3ee51ab93 100644 --- a/src/mspell/mspell-lite.c +++ b/src/mspell/mspell-lite.c @@ -57,7 +57,7 @@ bool adjacent_grid_check(player_type *target_ptr, monster_type *m_ptr, POSITION int next_y = *yp + tonari_y[next][i]; grid_type *g_ptr; g_ptr = &target_ptr->current_floor_ptr->grid_array[next_y][next_x]; - if (!cave_have_flag_grid(g_ptr, f_flag)) + if (!cave_has_flag_grid(g_ptr, f_flag)) continue; if (path_check(target_ptr, m_ptr->fy, m_ptr->fx, next_y, next_x)) { diff --git a/src/pet/pet-fall-off.c b/src/pet/pet-fall-off.c index 5ac35b00f..7b57bd598 100644 --- a/src/pet/pet-fall-off.c +++ b/src/pet/pet-fall-off.c @@ -115,12 +115,12 @@ bool process_fall_off_horse(player_type *creature_ptr, HIT_POINT dam, bool force continue; /* Skip non-empty grids */ - if (!cave_have_flag_grid(g_ptr, FF_MOVE) && !cave_have_flag_grid(g_ptr, FF_CAN_FLY)) { + if (!cave_has_flag_grid(g_ptr, FF_MOVE) && !cave_has_flag_grid(g_ptr, FF_CAN_FLY)) { if (!can_player_ride_pet(creature_ptr, g_ptr, FALSE)) continue; } - if (cave_have_flag_grid(g_ptr, FF_PATTERN)) + if (cave_has_flag_grid(g_ptr, FF_PATTERN)) continue; /* Count "safe" grids */ diff --git a/src/room/vault-builder.c b/src/room/vault-builder.c index 3a731846e..fb6e38b9e 100644 --- a/src/room/vault-builder.c +++ b/src/room/vault-builder.c @@ -22,7 +22,7 @@ static bool player_grid(player_type *player_ptr, grid_type *g_ptr) { return g_pt */ static bool is_cave_empty_grid(player_type *player_ptr, grid_type *g_ptr) { - bool is_empty_grid = cave_have_flag_grid(g_ptr, FF_PLACE); + bool is_empty_grid = cave_has_flag_grid(g_ptr, FF_PLACE); is_empty_grid &= g_ptr->m_idx == 0; is_empty_grid &= !player_grid(player_ptr, g_ptr); return is_empty_grid; diff --git a/src/spell-kind/spells-detection.c b/src/spell-kind/spells-detection.c index a7b887c90..6bdec9a5a 100644 --- a/src/spell-kind/spells-detection.c +++ b/src/spell-kind/spells-detection.c @@ -58,7 +58,7 @@ static bool detect_feat_flag(player_type *caster_ptr, POSITION range, int flag, } } - if (cave_have_flag_grid(g_ptr, flag)) { + if (cave_has_flag_grid(g_ptr, flag)) { disclose_grid(caster_ptr, y, x); g_ptr->info |= (CAVE_MARK); lite_spot(caster_ptr, y, x); diff --git a/src/spell-kind/spells-floor.c b/src/spell-kind/spells-floor.c index 19291d4e6..c904b3a82 100644 --- a/src/spell-kind/spells-floor.c +++ b/src/spell-kind/spells-floor.c @@ -360,7 +360,7 @@ bool destroy_area(player_type *caster_ptr, POSITION y1, POSITION x1, POSITION r, delete_all_items_from_floor(caster_ptr, y, x); /* Destroy "non-permanent" grids */ - if (cave_have_flag_grid(g_ptr, FF_PERMANENT)) + if (cave_has_flag_grid(g_ptr, FF_PERMANENT)) continue; /* Wall (or floor) type */ diff --git a/src/spell-realm/spells-chaos.c b/src/spell-realm/spells-chaos.c index 731cbe538..c1464fa73 100644 --- a/src/spell-realm/spells-chaos.c +++ b/src/spell-realm/spells-chaos.c @@ -35,7 +35,7 @@ void call_the_void(player_type *caster_ptr) for (int i = 0; i < 9; i++) { g_ptr = &caster_ptr->current_floor_ptr->grid_array[caster_ptr->y + ddy_ddd[i]][caster_ptr->x + ddx_ddd[i]]; - if (!cave_have_flag_grid(g_ptr, FF_PROJECT)) { + if (!cave_has_flag_grid(g_ptr, FF_PROJECT)) { if (!g_ptr->mimic || !has_flag(f_info[g_ptr->mimic].flags, FF_PROJECT) || !permanent_wall(&f_info[g_ptr->feat])) { do_call = FALSE; break; diff --git a/src/target/grid-selector.c b/src/target/grid-selector.c index 1f67d8e8b..1c93982be 100644 --- a/src/target/grid-selector.c +++ b/src/target/grid-selector.c @@ -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; } -- 2.11.0