summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/itemname.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/itemname.cc')
-rw-r--r--crawl-ref/source/itemname.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index d1b01e9a1e..46ffb389da 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -3014,9 +3014,7 @@ void init_item_name_cache()
item.special = 0;
std::string name = item.name(DESC_DBNAME, true, true);
- unsigned glyph;
- unsigned short colour;
- get_item_glyph(&item, &glyph, &colour);
+ glyph g = get_item_glyph(&item);
destroy_item(o, true);
lowercase(name);
@@ -3032,8 +3030,8 @@ void init_item_name_cache()
if (item_names_cache.find(name) == item_names_cache.end())
{
item_names_cache[name] = pair;
- if (glyph)
- item_names_by_glyph_cache[glyph].push_back(name);
+ if (g.ch)
+ item_names_by_glyph_cache[g.ch].push_back(name);
}
}
}