summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/showsymb.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-10-16 23:43:58 +0200
committerAdam Borowski <kilobyte@angband.pl>2012-10-16 23:59:14 +0200
commit5eec67434e2cfa8fc198758ce3a9c3fde20b4f1b (patch)
treec184122190b0e4cad28af50a15a54c99d21a76fe /crawl-ref/source/showsymb.cc
parentc7bc4ef4601da77ecc7c4df6ead6fc068dc2f003 (diff)
downloadcrawl-ref-5eec67434e2cfa8fc198758ce3a9c3fde20b4f1b.tar.gz
crawl-ref-5eec67434e2cfa8fc198758ce3a9c3fde20b4f1b.zip
Get rid of all but one uses of mon_display.
It's a duplicate of cglyph_t with an additional field that's only used once.
Diffstat (limited to 'crawl-ref/source/showsymb.cc')
-rw-r--r--crawl-ref/source/showsymb.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc
index f97685a4ae..004035ea09 100644
--- a/crawl-ref/source/showsymb.cc
+++ b/crawl-ref/source/showsymb.cc
@@ -212,7 +212,7 @@ static cglyph_t _get_item_override(const item_def &item)
string name = stash_annotate_item(STASH_LUA_SEARCH_ANNOTATE, &item)
+ item.name(DESC_PLAIN);
- for (map<string, mon_display>::const_iterator ir = Options.item_glyph_overrides.begin();
+ for (map<string, cglyph_t>::const_iterator ir = Options.item_glyph_overrides.begin();
ir != Options.item_glyph_overrides.end(); ++ir)
{
text_pattern tpat(ir->first);
@@ -221,10 +221,10 @@ static cglyph_t _get_item_override(const item_def &item)
// You may have a rule that sets the glyph but not colour for
// axes, then another that sets colour only for artefacts
// (useless items, etc). Thus, apply only parts that apply.
- if (ir->second.glyph)
- g.ch = ir->second.glyph;
- if (ir->second.colour)
- g.col = ir->second.colour;
+ if (ir->second.ch)
+ g.ch = ir->second.ch;
+ if (ir->second.col)
+ g.col = ir->second.col;
}
}