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/directn.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/directn.cc')
-rw-r--r-- | crawl-ref/source/directn.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index ed8b044461..f2a9ca64e9 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -473,7 +473,7 @@ void full_describe_view() for (radius_iterator ri(you.pos(), LOS_RADIUS); ri; ++ri) { if (feat_stair_direction(grd(*ri)) != CMD_NO_CMD - || is_altar(grd(*ri))) + || feat_is_altar(grd(*ri))) { list_features.push_back(*ri); } @@ -693,7 +693,7 @@ void full_describe_view() desc += "</" + colour_str +">) "; #endif desc += feature_description(c); - if (is_travelable_stair(grd(c)) && !travel_cache.know_stair(c)) + if (feat_is_travelable_stair(grd(c)) && !travel_cache.know_stair(c)) desc += " (not visited)"; FeatureMenuEntry *me = new FeatureMenuEntry(desc, c, hotkey); me->tag = "description"; @@ -3058,7 +3058,7 @@ static std::string _stair_destination_description(const coord_def &pos) const stair_info *si = linf->get_stair(pos); if (si) return (" " + si->describe()); - else if (is_stair(grd(pos))) + else if (feat_is_stair(grd(pos))) return (" (unknown stair)"); } return (""); |