diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-20 13:11:28 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-20 13:52:24 +0100 |
| commit | 87e8df0226e3b8c01543aed873aa28bfd31c474c (patch) | |
| tree | 0e67c64ff216b24a384a036d6e8f9f0e6e8b8bc6 /crawl-ref/source/viewmap.cc | |
| parent | a1f03b4ec494079e000640e5260d58df301962ca (diff) | |
| download | crawl-ref-87e8df0226e3b8c01543aed873aa28bfd31c474c.tar.gz crawl-ref-87e8df0226e3b8c01543aed873aa28bfd31c474c.zip | |
Make emphasise() and is_unknown_stair() refer to map_knowledge.
They are no longer passed a "remembered feature" as parameter.
Diffstat (limited to 'crawl-ref/source/viewmap.cc')
| -rw-r--r-- | crawl-ref/source/viewmap.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/viewmap.cc b/crawl-ref/source/viewmap.cc index 12a275343b..8a79f03806 100644 --- a/crawl-ref/source/viewmap.cc +++ b/crawl-ref/source/viewmap.cc @@ -1096,9 +1096,10 @@ static char _get_travel_colour( const coord_def& p ) Options.tc_disconnected; } -bool emphasise(const coord_def& where, dungeon_feature_type feat) +bool emphasise(const coord_def& where) { - return (is_unknown_stair(where, feat) + dungeon_feature_type feat = env.map_knowledge(where).feat(); + return (is_unknown_stair(where) && (you.your_level || feat_stair_direction(feat) == CMD_GO_DOWNSTAIRS) && you.where_are_you != BRANCH_VESTIBULE_OF_HELL); } @@ -1143,7 +1144,7 @@ screen_buffer_t colour_code_map(const coord_def& p, bool item_colour, const feature_def &fdef = get_feature_def(feat_value); feature_colour = terrain_seen ? fdef.seen_colour : fdef.map_colour; - if (terrain_seen && fdef.seen_em_colour && emphasise(p, feat_value)) + if (terrain_seen && fdef.seen_em_colour && emphasise(p)) feature_colour = fdef.seen_em_colour; if (feature_colour != DARKGREY) |