Make emphasise() and is_unknown_stair() refer to map_knowledge.

They are no longer passed a "remembered feature" as parameter.

5 files changed, 9 insertions, 10 deletions

diff --git a/crawl-ref/source/show.cc b/crawl-ref/source/show.cc
index ec18a5aae7..498e7c05e0 100644
--- a/crawl-ref/source/show.cc
+++ b/crawl-ref/source/show.cc
@@ -157,7 +157,7 @@ static unsigned short _feat_colour(const coord_def &where,
             colour = _tree_colour(where);
 
         if (fdef.em_colour && fdef.em_colour != fdef.colour &&
-            emphasise(where, feat))
+            emphasise(where))
         {
             colour = fdef.em_colour;
         }
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index ce997b1bbc..906b67b5e4 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -225,10 +225,9 @@ inline bool is_player_altar(const coord_def &c)
     return feat_is_player_altar(grd(c));
 }
 
-bool is_unknown_stair(const coord_def &p, dungeon_feature_type remembered_feat)
+bool is_unknown_stair(const coord_def &p)
 {
-    dungeon_feature_type feat = (remembered_feat == NUM_FEATURES)
-                                    ? env.grid(p) : remembered_feat;
+    dungeon_feature_type feat = env.map_knowledge(p).feat();
     return (feat_is_travelable_stair(feat) && !travel_cache.know_stair(p));
 }
 
diff --git a/crawl-ref/source/travel.h b/crawl-ref/source/travel.h
index 2b0b8240b9..5b405e4e9e 100644
--- a/crawl-ref/source/travel.h
+++ b/crawl-ref/source/travel.h
@@ -66,8 +66,7 @@ const char *trap_name(const coord_def &p);
 #endif
 void explore_pickup_event(int did_pickup, int tried_pickup);
 bool feat_is_traversable(dungeon_feature_type feat);
-bool is_unknown_stair(const coord_def &p,
-    dungeon_feature_type remembered_feat = NUM_FEATURES);
+bool is_unknown_stair(const coord_def &p);
 
 void find_travel_pos(const coord_def& youpos, char *move_x, char *move_y,
                      std::vector<coord_def>* coords = NULL);
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)
diff --git a/crawl-ref/source/viewmap.h b/crawl-ref/source/viewmap.h
index c5ab21e394..b5f94ef71b 100644
--- a/crawl-ref/source/viewmap.h
+++ b/crawl-ref/source/viewmap.h
@@ -4,7 +4,7 @@
 screen_buffer_t colour_code_map(const coord_def& p, bool item_colour = false,
                                 bool travel_colour = false, bool on_level = true);
 
-bool emphasise(const coord_def& where, dungeon_feature_type feat);
+bool emphasise(const coord_def& where);
 
 #endif