diff options
author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-15 21:19:26 +0100 |
---|---|---|
committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-15 23:11:41 +0100 |
commit | ddf80f7077a00bd04168c904b153fb1e657b9d38 (patch) | |
tree | 4b5d1b094e46b731f03b3665f4526bb6ed9c37dc /crawl-ref/source/show.cc | |
parent | c6c0a0f71e0d459b8438ff2e998fbedcb9c1c99a (diff) | |
download | crawl-ref-ddf80f7077a00bd04168c904b153fb1e657b9d38.tar.gz crawl-ref-ddf80f7077a00bd04168c904b153fb1e657b9d38.zip |
Convert get_item_glyph to return a glyph struct.
Also don't use get_symbol.
Diffstat (limited to 'crawl-ref/source/show.cc')
-rw-r--r-- | crawl-ref/source/show.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/show.cc b/crawl-ref/source/show.cc index 14edff3161..cc040dd408 100644 --- a/crawl-ref/source/show.cc +++ b/crawl-ref/source/show.cc @@ -189,6 +189,8 @@ void show_def::_update_item_at(const coord_def &gp, const coord_def &ep) const item_def &eitem = mitm[igrd(gp)]; unsigned short &ecol = grid(ep).colour; + glyph g = get_item_glyph(&eitem); + const dungeon_feature_type feat = grd(gp); if (Options.feature_item_brand && is_critical_feature(feat)) ecol |= COLFLAG_FEATURE_ITEM; @@ -198,7 +200,7 @@ void show_def::_update_item_at(const coord_def &gp, const coord_def &ep) { const unsigned short gcol = env.grid_colours(gp); ecol = (feat == DNGN_SHALLOW_WATER) ? - (gcol != BLACK ? gcol : CYAN) : eitem.colour; + (gcol != BLACK ? gcol : CYAN) : g.col; if (eitem.link != NON_ITEM && !crawl_state.arena) ecol |= COLFLAG_ITEM_HEAP; grid(ep).cls = SH_ITEM; |