diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-13 23:14:13 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-13 23:14:13 +0000 |
| commit | 289b890fb1cc7b1c01b32c11c49952980592de43 (patch) | |
| tree | 99342d477b3f5bdd546c7daacfbc69d8dd8409f5 /crawl-ref/source/command.cc | |
| parent | 672a1cbf174bcbad5cf6d597839901ff48e8b6a5 (diff) | |
| download | crawl-ref-289b890fb1cc7b1c01b32c11c49952980592de43.tar.gz crawl-ref-289b890fb1cc7b1c01b32c11c49952980592de43.zip | |
* Call message flush before entering a shop.
* Indent shopping commands correctly.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9455 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/command.cc')
| -rw-r--r-- | crawl-ref/source/command.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index 072fae928a..6dec8688a0 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -2056,6 +2056,7 @@ static void _add_formatted_keyhelp(column_composer &cols) // Initialize colour to quiet some Valgrind warnings unsigned short colour = BLACK; std::string item_types = + "\n" "<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" @@ -2168,7 +2169,8 @@ static void _add_formatted_keyhelp(column_composer &cols) "<w>r</w> : Read a scroll or book\n" "<w>M</w> : Memorise a spell from a book\n" "<w>w</w> : Wield an item ( <w>-</w> for none)\n" - "<w>'</w> : wield item a, or switch to b\n" + "<w>'</w> : wield item a, or switch to b \n" + " (use <w>=</w> to assign slots)\n" "<w>v</w> : eVoke power of wielded item\n" "<w>W</w>/<w>T</w> : Wear or Take off armour\n" "<w>P</w>/<w>R</w> : Put on or Remove jewellery\n", @@ -2180,16 +2182,17 @@ static void _add_formatted_keyhelp(column_composer &cols) interact = "<h>Item Interaction (floor):\n" "<w>,</w> : pick up items (also <w>g</w>) \n" - " (press twice for pick up menu) \n" + " (press twice for pick up menu)\n" "<w>d</w> : Drop an item\n" - "<w>d#</w>: Drop exact number of items \n" - "<w>c</w> : Chop up a corpse "; + "<w>d#</w>: Drop exact number of items\n" + "<w>c</w> : Chop up a corpse"; if (you.species == SP_VAMPIRE && you.experience >= 6) - interact += "or bottle its blood "; + interact += " or bottle its blood"; interact += - "\n<w>e</w> : Eat food from floor \n"; + "\n" + "<w>e</w> : Eat food from floor\n"; cols.add_formatted( 1, interact, |