Convert get_item_glyph to return a glyph struct.

Also don't use get_symbol.

1 files changed, 4 insertions, 5 deletions

diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 9c012ee199..73751e1ab0 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -690,11 +690,10 @@ void item_check(bool verbose)
         std::vector<unsigned short int> item_chars;
         for (unsigned int i = 0; i < items.size() && i < 50; ++i)
         {
-            unsigned glyph_char;
-            unsigned short glyph_col;
-            get_item_glyph( items[i], &glyph_char, &glyph_col );
-            item_chars.push_back( glyph_char * 0x100 +
-                                  (10 - item_name_specialness(*(items[i]))) );
+            glyph g = get_item_glyph(items[i]);
+            get_item_glyph(items[i]);
+            item_chars.push_back(g.ch * 0x100 +
+                                 (10 - item_name_specialness(*(items[i]))));
         }
         std::sort(item_chars.begin(), item_chars.end());