Fix 2493899: colour tags in inventory after using 'V'.

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

3 files changed, 12 insertions, 19 deletions

diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index bc39cfa966..075541a84a 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -1265,7 +1265,8 @@ by the sense of achievement you get from getting it to work at all.
 scroll of recharging
 
 This scroll restores the charges of any magical wand or rod chosen by 
-its reader, and can also be used to charge weapons of electrocution.
+its reader, and can also be used to increase the damage dealt by weapons 
+of electrocution.
 %%%%
 scroll of remove curse
 
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index bd1c954fa4..52d1511380 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -582,24 +582,9 @@ void full_describe_view()
             ++menu_index;
             const char letter = index_to_letter(menu_index);
             const item_def &item = list_items[i];
-/*
-            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 + ">) ";
 
-            const std::string str = prefix +
-                uppercase_first(item.name(DESC_PLAIN));
-*/
             InvEntry *me = new InvEntry(item);
-//            MenuEntry *me = new MenuEntry(str, MEL_ITEM, 1, letter);
-//            me->item = item;
-//            me->data = reinterpret_cast<void*>(
-//                const_cast<item_def*>(&item));
+
 #ifndef USE_TILE
             // Show glyphs only for ASCII.
             me->set_show_glyph(true);
@@ -649,6 +634,15 @@ void full_describe_view()
             describe_item( *i );
         }
     }
+
+#ifndef USE_TILE
+    if (!list_items.empty())
+    {
+        // Unset show_glyph for other menus.
+        InvEntry *me = new InvEntry(list_items[0]);
+        me->set_show_glyph(false);
+    }
+#endif
 }
 
 
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index 461107161a..b93bc2c8b9 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -274,7 +274,6 @@ void InvEntry::add_class_hotkeys(const item_def &i)
 }
 
 bool InvEntry::show_prices = false;
-
 void InvEntry::set_show_prices(bool doshow)
 {
     show_prices = doshow;
@@ -291,7 +290,6 @@ InvShowPrices::~InvShowPrices()
 }
 
 bool InvEntry::show_glyph = false;
-
 void InvEntry::set_show_glyph(bool doshow)
 {
     show_glyph = doshow;