Properly use + or : for the book symbol in full command help (??) as well

as in tutorial mode.


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

1 files changed, 27 insertions, 17 deletions

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 38a9180a65..aab6f71042 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1745,24 +1745,34 @@ static void _add_formatted_keyhelp(column_composer &cols)
             "         untrap, attack without move\n",
             true, true, _cmdhelp_textfilter);
 
+    unsigned ch;
+    unsigned short colour;
+    std::string item_types =
+        "<h>Item types (and common commands)\n"
+        "<cyan>)</cyan> : hand weapons (<w>w</w>ield)\n"
+        "<brown>(</brown> : missiles (<w>Q</w>uiver, <w>f</w>ire, <w>(</w> cycle)\n"
+        "<cyan>[</cyan> : armour (<w>W</w>ear and <w>T</w>ake off)\n"
+        "<brown>%</brown> : corpses and food (<w>c</w>hop up and <w>e</w>at)\n"
+        "<w>?</w> : scrolls (<w>r</w>ead)\n"
+        "<magenta>!</magenta> : potions (<w>q</w>uaff)\n"
+        "<blue>=</blue> : rings (<w>P</w>ut on and <w>R</w>emove)\n"
+        "<red>\"</red> : amulets (<w>P</w>ut on and <w>R</w>emove)\n"
+        "<lightgrey>/</lightgrey> : wands (<w>Z</w>ap)\n"
+        "<lightcyan>";
+
+    get_item_symbol(DNGN_ITEM_BOOK, &ch, &colour);
+    item_types += static_cast<char>(ch); 
+    item_types += 
+        "</lightcyan> : books (<w>r</w>ead, <w>M</w>emorise and <w>z</w>ap)\n"
+        "<brown>\\</brown> : staves and rods (<w>w</w>ield and e<w>v</w>oke)\n"
+        "<lightgreen>}</lightgreen> : miscellaneous items (e<w>v</w>oke)\n"
+        "<lightmagenta>0</lightmagenta> : the Orb of Zot (Carry the Orb \n"
+        "    to the surface and win!)\n"
+        "<yellow>$</yellow> : gold\n",
+
+
     cols.add_formatted(
-            0,
-            "<h>Item types (and common commands)\n"
-            "<cyan>)</cyan> : hand weapons (<w>w</w>ield)\n"
-            "<brown>(</brown> : missiles (<w>Q</w>uiver, <w>f</w>ire, <w>(</w> cycle)\n"
-            "<cyan>[</cyan> : armour (<w>W</w>ear and <w>T</w>ake off)\n"
-            "<brown>%</brown> : corpses and food (<w>c</w>hop up and <w>e</w>at)\n"
-            "<w>?</w> : scrolls (<w>r</w>ead)\n"
-            "<magenta>!</magenta> : potions (<w>q</w>uaff)\n"
-            "<blue>=</blue> : rings (<w>P</w>ut on and <w>R</w>emove)\n"
-            "<red>\"</red> : amulets (<w>P</w>ut on and <w>R</w>emove)\n"
-            "<lightgrey>/</lightgrey> : wands (<w>Z</w>ap)\n"
-            "<lightcyan>+</lightcyan> : books (<w>r</w>ead, <w>M</w>emorise and <w>z</w>ap)\n"
-            "<brown>\\</brown> : staves and rods (<w>w</w>ield and e<w>v</w>oke)\n"
-            "<lightgreen>}</lightgreen> : miscellaneous items (e<w>v</w>oke)\n"
-            "<lightmagenta>0</lightmagenta> : the Orb of Zot (Carry the Orb \n"
-            "    to the surface and win!)\n"
-            "<yellow>$</yellow> : gold\n",
+            0, item_types,
             true, true, _cmdhelp_textfilter);
 
     cols.add_formatted(