diff options
| author | Vsevolod Kozlov <zaba@wybt.net> | 2010-12-18 19:18:16 +0300 |
|---|---|---|
| committer | Vsevolod Kozlov <zaba@wybt.net> | 2010-12-18 19:18:16 +0300 |
| commit | 7611701512615fe19ea78279fca88e284399a42e (patch) | |
| tree | 7c181985552cc702fef1e7c107029a89bd65fee4 /crawl-ref/source/dgn-shoals.cc | |
| parent | 62cfaebcd7896e575353a050f06f78748b00b6f2 (diff) | |
| download | crawl-ref-7611701512615fe19ea78279fca88e284399a42e.tar.gz crawl-ref-7611701512615fe19ea78279fca88e284399a42e.zip | |
Rename 'unforbidden' to 'map_masked' and invert logic accordingly.
Inverted logic right in the function name is rather confusing.
Diffstat (limited to 'crawl-ref/source/dgn-shoals.cc')
| -rw-r--r-- | crawl-ref/source/dgn-shoals.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc index 1af9cf8d03..b420753eb8 100644 --- a/crawl-ref/source/dgn-shoals.cc +++ b/crawl-ref/source/dgn-shoals.cc @@ -365,7 +365,7 @@ static int _shoals_contiguous_feature_flood( { const coord_def adj(*ai); if (in_bounds(adj) && !rmap(adj) && grd(adj) == feat - && unforbidden(adj, MMT_VAULT)) + && !map_masked(adj, MMT_VAULT)) { rmap(adj) = nregion; visit.push_back(adj); @@ -453,7 +453,7 @@ _shoals_point_feat_cluster(dungeon_feature_type feat, { coord_def c(*ri); if (!region_map(c) && grd(c) == feat - && unforbidden(c, MMT_VAULT)) + && !map_masked(c, MMT_VAULT)) { const int featcount = _shoals_contiguous_feature_flood(region_map, @@ -508,7 +508,7 @@ static void _shoals_make_plant_near(coord_def c, int radius, dgn_random_point_from(c, random2(1 + radius), _shoals_margin)); if (!plant_place.origin() && !monster_at(plant_place) - && unforbidden(plant_place, MMT_VAULT)) + && !map_masked(plant_place, MMT_VAULT)) { const dungeon_feature_type feat(grd(plant_place)); if (_shoals_plantworthy_feat(feat) @@ -618,7 +618,7 @@ static std::vector<coord_def> _shoals_windshadows(grid_bool &windy) // To avoid plants cropping up inside vaults, mark everything inside // vaults as "windy". for (rectangle_iterator ri(1); ri; ++ri) - if (!unforbidden(*ri, MMT_VAULT)) + if (map_masked(*ri, MMT_VAULT)) windy(*ri) = true; // Now we know the places in the wind shadow: |