From 0eb7e87096f07509f3fed6a82fab696d505a2c18 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Fri, 13 Jul 2007 11:26:38 +0000
Subject: [1746014] Added an implicit quiver when firing missiles:  - ^P/^N
 change the selected missile, but only within a fire_order slot.    i.e., if
 you're wielding a launcher and have "launcher" first in your    fire order,
 ^N and ^P will cycle only through suitable launcher ammo.  - If you use ^P or
 ^N to change the default missiles offered, that choice    gets saved as your
 quiver (unless you cancel targeting).  - Fire always offers the quivered item
 first, if appropriate (so if    you have darts quivered and try to shoot from
 a bow, the darts will    not be offered). Breaks save compatibility (quiver
 is saved).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1854 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/command.cc | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'crawl-ref/source/command.cc')

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 812a47266a..cd6955ec0a 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -538,7 +538,7 @@ static const char *level_map_help =
     "<w>Ctrl-W</w> : set Waypoint\n"
     "<w>Ctrl-C</w> : Clear level and main maps\n";
 
-static const char *targeting_help =
+static const char *targeting_help_1 =
     "<h>Examine surroundings ('<w>x</w><h>' in main):\n"
     "<w>Esc</w> : cancel (also <w>Space</w>)\n"
     "<w>Dir.</w>: move cursor in that direction\n"
@@ -563,6 +563,12 @@ static const char *targeting_help =
     "<w>:</w> : show/hide beam path\n"
     "<w>Shift-Dir</w> : shoot straight-line beam\n";
 
+static const char *targeting_help_2 =
+    "<h>Firing or throwing a missile:\n"
+    "<w>Ctrl-P</w> : cycle to previous missile.\n"
+    "<w>Ctrl-N</w> : cycle to next missile.\n";
+    
+
 static const char *interlevel_travel_branch_help =
     "<h>Interlevel Travel (choose a branch):\n"
     " Use the shortcut letter for a branch to select the branch for travel.\n"
@@ -796,7 +802,13 @@ void show_levelmap_help()
 
 void show_targeting_help()
 {
-    show_specific_help( targeting_help );
+    column_composer cols(2, 41);
+    // Page size is number of lines - one line for --more-- prompt.
+    cols.set_pagesize(get_number_of_lines() - 1);
+
+    cols.add_formatted(0, targeting_help_1, true, true);
+    cols.add_formatted(1, targeting_help_2, true, true);
+    show_keyhelp_menu(cols.formatted_lines(), false, true);
 }
 
 void show_interlevel_travel_branch_help()
-- 
cgit v1.2.3-54-g00ecf