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/tilereg.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/tilereg.cc')
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 4c7da0c727..d84a6bd320 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -1222,7 +1222,7 @@ int DungeonRegion::handle_mouse(MouseEvent &event) case CMD_GO_UPSTAIRS: return ('<'); default: - if (is_altar(feat) + if (feat_is_altar(feat) && player_can_join_god(feat_altar_god(feat))) { return ('p'); @@ -1350,7 +1350,7 @@ bool DungeonRegion::update_tip_text(std::string& tip) tip += "\n[Shift-L-Click] "; if (feat == DNGN_ENTER_SHOP) tip += "enter shop"; - else if (is_gate(feat)) + else if (feat_is_gate(feat)) tip += "enter gate"; else tip += "use stairs"; @@ -1360,7 +1360,7 @@ bool DungeonRegion::update_tip_text(std::string& tip) else tip += " (<)"; } - else if (is_altar(feat) && player_can_join_god(feat_altar_god(feat))) + else if (feat_is_altar(feat) && player_can_join_god(feat_altar_god(feat))) tip += "\n[Shift-L-Click] pray on altar (p)"; // Character overview. |