diff options
| -rw-r--r-- | crawl-ref/source/abyss.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/showsymb.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/showsymb.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 4 |
4 files changed, 5 insertions, 11 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index d28f1d4f30..fbed1c9900 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -364,7 +364,7 @@ static int _abyss_rune_nearness() // See above comment about is_terrain_known(). for (radius_iterator ri(you.pos(), LOS_RADIUS); ri; ++ri) { - if (get_screen_glyph(ri->x, ri->y) != ' ') + if (get_screen_glyph(*ri) != ' ') { for (stack_iterator si(*ri); si; ++si) if (is_rune(*si) && si->plus == RUNE_ABYSSAL) diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc index 55f3f51892..676673be22 100644 --- a/crawl-ref/source/showsymb.cc +++ b/crawl-ref/source/showsymb.cc @@ -132,22 +132,17 @@ glyph get_mons_glyph(const monsters *mons) return (g); } -unsigned get_screen_glyph( int x, int y ) -{ - return get_screen_glyph(coord_def(x,y)); -} - unsigned get_screen_glyph(const coord_def& p) { const coord_def ep = view2show(grid2view(p)); show_type object = env.show(ep); - unsigned short colour = object.colour; - unsigned ch; if (!object) return get_map_knowledge_char(p.x, p.y); + unsigned short colour; + unsigned ch; get_symbol(p, object, &ch, &colour); return (ch); } diff --git a/crawl-ref/source/showsymb.h b/crawl-ref/source/showsymb.h index 10fc84500d..85939a5b61 100644 --- a/crawl-ref/source/showsymb.h +++ b/crawl-ref/source/showsymb.h @@ -12,7 +12,6 @@ struct glyph glyph get_item_glyph(const item_def *item); glyph get_mons_glyph(const monsters *mons); -unsigned get_screen_glyph( int x, int y ); unsigned get_screen_glyph( const coord_def &p ); void get_symbol(const coord_def& where, diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 562d1d8498..72f8f2c4cf 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -492,9 +492,9 @@ std::string screenshot(bool fullscreen) int ch = (!map_bounds(gc)) ? 0 : - (!crawl_view.in_grid_los(gc)) ? get_map_knowledge_char(gc.x, gc.y) : + (!crawl_view.in_grid_los(gc)) ? get_map_knowledge_char(gc) : (gc == you.pos()) ? you.symbol - : get_screen_glyph(gc.x, gc.y); + : get_screen_glyph(gc); if (ch && !isprint(ch)) { |