summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/invent.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-15 21:19:26 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-15 23:11:41 +0100
commitddf80f7077a00bd04168c904b153fb1e657b9d38 (patch)
tree4b5d1b094e46b731f03b3665f4526bb6ed9c37dc /crawl-ref/source/invent.cc
parentc6c0a0f71e0d459b8438ff2e998fbedcb9c1c99a (diff)
downloadcrawl-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/invent.cc')
-rw-r--r--crawl-ref/source/invent.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index 6149d99b48..571eabe96d 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -191,13 +191,11 @@ std::string InvEntry::get_text() const
if (InvEntry::show_glyph)
{
- unsigned glyph_char;
- unsigned short glyph_col;
- get_item_glyph( item, &glyph_char, &glyph_col );
+ glyph g = get_item_glyph(item);
- const std::string col_string = colour_to_str(glyph_col);
+ const std::string col_string = colour_to_str(g.col);
const std::string prefix = " (<" + col_string + ">"
- + static_cast<char>(glyph_char)
+ + static_cast<char>(g.ch)
+ "</" + col_string + ">)";
tstr << prefix;
}