Allow tiles in 'V' menu, at least for items - the menu structure can't

handle monster information (yet?)
This means that the two parts (monsters/items) are differently formatted
but for Tiles this looks much better this way than it did before.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8143 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 22 insertions, 1 deletions

diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index fa03f8b291..ac1e6f5b86 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -189,7 +189,21 @@ std::string InvEntry::get_text() const
         tstr << '#';
     else
         tstr << '+';
+
+    if (InvEntry::show_glyph)
+    {
+        unsigned glyph_char;
+        unsigned short glyph_col;
+        get_item_glyph( item, &glyph_char, &glyph_col );
+
+        const std::string col_string = colour_to_str(glyph_col);
+        const std::string prefix = " (<" + col_string + ">"
+                                   + static_cast<char>(glyph_char)
+                                   + "</" + col_string + ">)";
+        tstr << prefix;
+    }
     tstr << ' ' << text;
+
     if (InvEntry::show_prices)
     {
         const int value = item_value(*item, show_prices);
@@ -274,6 +288,13 @@ InvShowPrices::~InvShowPrices()
     InvEntry::set_show_prices(false);
 }
 
+bool InvEntry::show_glyph = false;
+
+void InvEntry::set_show_glyph(bool doshow)
+{
+    show_glyph = doshow;
+}
+
 InvMenu::InvMenu(int mflags)
     : Menu(mflags, "inventory", false), type(MT_INVLIST), pre_select(NULL),
       title_annotate(NULL)
@@ -399,7 +420,7 @@ void InvMenu::load_inv_items(int item_selector, int excluded_slot,
 bool InvEntry::tile(int &idx, TextureID &tex) const
 {
     if (quantity <= 0)
-        return false;
+        return (false);
 
     idx = tileidx_item(*item);
     tex = TEX_DEFAULT;