summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/format.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/format.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/format.cc')
-rw-r--r--crawl-ref/source/format.cc8
1 files changed, 3 insertions, 5 deletions
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);
}