From ddf80f7077a00bd04168c904b153fb1e657b9d38 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sun, 15 Nov 2009 21:19:26 +0100 Subject: Convert get_item_glyph to return a glyph struct. Also don't use get_symbol. --- crawl-ref/source/format.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/format.cc') diff --git a/crawl-ref/source/format.cc b/crawl-ref/source/format.cc index 224bfda38f..d4c8d16a6c 100644 --- a/crawl-ref/source/format.cc +++ b/crawl-ref/source/format.cc @@ -494,11 +494,9 @@ formatted_string formatted_string::substr(size_t start, size_t substr_length) co void formatted_string::add_glyph(const item_def *item) { const int last_col = find_last_colour(); - unsigned ch; - unsigned short col; - get_item_glyph(item, &ch, &col); - this->textcolor(col); - this->cprintf("%s", stringize_glyph(ch).c_str()); + glyph g = get_item_glyph(item); + this->textcolor(g.col); + this->cprintf("%s", stringize_glyph(g.ch).c_str()); this->textcolor(last_col); } -- cgit v1.2.3-54-g00ecf