summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/format.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-15 21:32:30 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-15 23:11:41 +0100
commitd13f2354db0c50108beccd90aea26ec416e20d07 (patch)
tree7fea3408b5b3006419feff73035198bf8cc1e560 /crawl-ref/source/format.cc
parentddf80f7077a00bd04168c904b153fb1e657b9d38 (diff)
downloadcrawl-ref-d13f2354db0c50108beccd90aea26ec416e20d07.tar.gz
crawl-ref-d13f2354db0c50108beccd90aea26ec416e20d07.zip
Convert get_mons_glyph to return a glyph struct.
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 d4c8d16a6c..69e8b9be5a 100644
--- a/crawl-ref/source/format.cc
+++ b/crawl-ref/source/format.cc
@@ -503,11 +503,9 @@ void formatted_string::add_glyph(const item_def *item)
void formatted_string::add_glyph(const monsters *mons)
{
const int last_col = find_last_colour();
- unsigned ch;
- unsigned short col;
- get_mons_glyph(mons, &ch, &col);
- this->textcolor(col);
- this->cprintf("%s", stringize_glyph(ch).c_str());
+ glyph g = get_mons_glyph(mons);
+ this->textcolor(g.col);
+ this->cprintf("%s", stringize_glyph(g.ch).c_str());
this->textcolor(last_col);
}