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/dungeon.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/dungeon.cc')
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 3cd7471f5c..5893121c55 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -5243,10 +5243,10 @@ bool join_the_dots(const coord_def &from, const coord_def &to, join_count++; const dungeon_feature_type feat = grd(at); - if (early_exit && at != from && is_traversable(feat)) + if (early_exit && at != from && feat_is_traversable(feat)) return (true); - if (unforbidden(at, MMT_VAULT) && !is_traversable(feat)) + if (unforbidden(at, MMT_VAULT) && !feat_is_traversable(feat)) grd(at) = DNGN_FLOOR; if (join_count > 10000) // just insurance @@ -7698,7 +7698,7 @@ struct nearest_point inline static bool _dgn_square_travel_ok(const coord_def &c) { const dungeon_feature_type feat = grd(c); - return (is_traversable(feat) || feat_is_trap(feat) + return (feat_is_traversable(feat) || feat_is_trap(feat) || feat == DNGN_SECRET_DOOR); } |