diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-17 08:59:19 +0200 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-17 09:09:43 +0200 |
| commit | 91480fa09bfd0c7e937cdf0b29360c9e10413f62 (patch) | |
| tree | 8de9cb01752af154a93f3060e8163f08cefb1a0c /crawl-ref/source/abyss.cc | |
| parent | dcc94e4df24a1111124d87532aaa263f55edf58d (diff) | |
| download | crawl-ref-91480fa09bfd0c7e937cdf0b29360c9e10413f62.tar.gz crawl-ref-91480fa09bfd0c7e937cdf0b29360c9e10413f62.zip | |
More renaming and reorganization of feature checks.
There were a couple of functions is_something(dgn_feature_type feat)
defined in travel.cc that were otherwise independent of travel. For
consistency, move these to terrain.cc and rename to feat_is_something.
One might also consider renaming the various feat_is_whatever functions
to just is_whatever.
Diffstat (limited to 'crawl-ref/source/abyss.cc')
| -rw-r--r-- | crawl-ref/source/abyss.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index 13bc428e2c..5d93e77e67 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -788,7 +788,7 @@ static bool _is_crowded_square(const coord_def &c) continue; const coord_def n(c.x + xi, c.y + yi); - if (!in_bounds(n) || !is_traversable(grd(n))) + if (!in_bounds(n) || !feat_is_traversable(grd(n))) continue; if (++neighbours > 4) @@ -829,13 +829,13 @@ static void _corrupt_square(const crawl_environment &oenv, const coord_def &c) return; } - if (is_traversable(grd(c)) && !is_traversable(feat) + if (feat_is_traversable(grd(c)) && !feat_is_traversable(feat) && _is_crowded_square(c)) { return; } - if (!is_traversable(grd(c)) && is_traversable(feat) && _is_sealed_square(c)) + if (!feat_is_traversable(grd(c)) && feat_is_traversable(feat) && _is_sealed_square(c)) return; // What's this supposed to achieve? (jpeg) |