diff options
-rw-r--r-- | crawl-ref/source/map_knowledge.cc | 15 | ||||
-rw-r--r-- | crawl-ref/source/view.cc | 10 |
2 files changed, 2 insertions, 23 deletions
diff --git a/crawl-ref/source/map_knowledge.cc b/crawl-ref/source/map_knowledge.cc index 81cbde90fe..578ca2f2b9 100644 --- a/crawl-ref/source/map_knowledge.cc +++ b/crawl-ref/source/map_knowledge.cc @@ -83,21 +83,6 @@ bool is_map_knowledge_detected_mons(int x, int y) return (env.map_knowledge[x][y].flags & MAP_DETECTED_MONSTER); } -void set_map_knowledge_glyph(int x, int y, show_type object, int col) -{ - map_cell &c = env.map_knowledge[x][y]; - c.object = object; - c.colour = col; -#ifdef USE_TILE - tiles.update_minimap(x, y); -#endif -} - -void set_map_knowledge_glyph(const coord_def& c, show_type object, int col) -{ - set_map_knowledge_glyph(c.x, c.y, object, col); -} - void set_map_knowledge_obj(const coord_def& where, show_type obj) { env.map_knowledge(where).object = obj; diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 1861792b1f..946a4567f6 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -688,11 +688,8 @@ static bool player_view_update_at(const coord_def &gc) bool need_excl_update = is_terrain_changed(gc) || !is_terrain_seen(gc); - show_type object = env.show(ep); - glyph g = get_show_glyph(object); - set_terrain_seen(gc); - set_map_knowledge_glyph(gc, object, g.col); + set_map_knowledge_obj(gc, env.show(ep)); set_map_knowledge_detected_mons(gc, false); set_map_knowledge_detected_item(gc, false); @@ -707,10 +704,7 @@ static bool player_view_update_at(const coord_def &gc) #endif if (Options.clean_map && env.show.get_backup(ep)) - { - glyph gb = get_show_glyph(env.show.get_backup(ep)); - set_map_knowledge_glyph(gc, env.show.get_backup(ep), gb.col); - } + set_map_knowledge_obj(gc, env.show.get_backup(ep)); return (need_excl_update); } |