From 241ceb5971b5c87b58e7f28f9fee417230561a5d Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 17 Oct 2009 00:16:20 +0200 Subject: Globally replace see_grid by see_cell. --- crawl-ref/source/terrain.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'crawl-ref/source/terrain.cc') diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc index 69f9ec4240..ad0b33ee11 100644 --- a/crawl-ref/source/terrain.cc +++ b/crawl-ref/source/terrain.cc @@ -604,7 +604,7 @@ void dungeon_terrain_changed(const coord_def &pos, unnotice_feature(level_pos(level_id::current(), pos)); grd(pos) = nfeat; env.grid_colours(pos) = BLACK; - if (is_notable_terrain(nfeat) && see_grid(pos)) + if (is_notable_terrain(nfeat) && see_cell(pos)) seen_notable_thing(nfeat, pos); // Don't destroy a trap which was just placed. @@ -627,7 +627,7 @@ static void _announce_swap_real(coord_def orig_pos, coord_def dest_pos) const std::string orig_name = feature_description(dest_pos, false, - see_grid(orig_pos) ? DESC_CAP_THE : DESC_CAP_A, + see_cell(orig_pos) ? DESC_CAP_THE : DESC_CAP_A, false); std::string prep = grid_preposition(orig_feat, false); @@ -651,13 +651,13 @@ static void _announce_swap_real(coord_def orig_pos, coord_def dest_pos) std::ostringstream str; str << orig_name << " "; - if (see_grid(orig_pos) && !see_grid(dest_pos)) + if (see_cell(orig_pos) && !see_cell(dest_pos)) { str << "suddenly disappears"; if (!orig_actor.empty()) str << " from " << prep << " " << orig_actor; } - else if (!see_grid(orig_pos) && see_grid(dest_pos)) + else if (!see_cell(orig_pos) && see_cell(dest_pos)) { str << "suddenly appears"; if (!dest_actor.empty()) @@ -677,7 +677,7 @@ static void _announce_swap_real(coord_def orig_pos, coord_def dest_pos) static void _announce_swap(coord_def pos1, coord_def pos2) { - if (!see_grid(pos1) && !see_grid(pos2)) + if (!see_cell(pos1) && !see_cell(pos2)) return; const dungeon_feature_type feat1 = grd(pos1); @@ -686,8 +686,8 @@ static void _announce_swap(coord_def pos1, coord_def pos2) if (feat1 == feat2) return; - const bool notable_seen1 = is_notable_terrain(feat1) && see_grid(pos1); - const bool notable_seen2 = is_notable_terrain(feat2) && see_grid(pos2); + const bool notable_seen1 = is_notable_terrain(feat1) && see_cell(pos1); + const bool notable_seen2 = is_notable_terrain(feat2) && see_cell(pos2); coord_def orig_pos, dest_pos; if (notable_seen1 && notable_seen2) @@ -699,7 +699,7 @@ static void _announce_swap(coord_def pos1, coord_def pos2) _announce_swap_real(pos2, pos1); else if (notable_seen2) _announce_swap_real(pos1, pos2); - else if (see_grid(pos2)) + else if (see_cell(pos2)) _announce_swap_real(pos1, pos2); else _announce_swap_real(pos2, pos1); @@ -717,13 +717,13 @@ bool swap_features(const coord_def &pos1, const coord_def &pos2, const dungeon_feature_type feat1 = grd(pos1); const dungeon_feature_type feat2 = grd(pos2); - if (is_notable_terrain(feat1) && !see_grid(pos1) + if (is_notable_terrain(feat1) && !see_cell(pos1) && is_terrain_known(pos1)) { return (false); } - if (is_notable_terrain(feat2) && !see_grid(pos2) + if (is_notable_terrain(feat2) && !see_cell(pos2) && is_terrain_known(pos2)) { return (false); -- cgit v1.2.3-54-g00ecf