From 917c8e96d491847ee8c15ca60a621b551b8f06c6 Mon Sep 17 00:00:00 2001
From: pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Fri, 29 Feb 2008 09:46:50 +0000
Subject: FR 1900612 Patch 1901093

Merge 't' functionality into 'f'.

Firing interface allows selection of inventory item by hitting 'i'.
Items selected through the inventory interface will not be quivered.
Firing interface prints "Firing", "Throwing", "Awkwardly throwing"
depending on the item selected.
In-game documentation and manual updated.



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

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

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index f6a42f6382..7f0f9e3f45 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -593,7 +593,9 @@ static const char *targeting_help_1 =
 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";
+    "<w>Ctrl-N</w> : cycle to next missile.\n"
+    "<w>i</w>      : choose from inventory.\n"
+;
     
 
 // Add the contents of the file fp to the scroller menu m.
@@ -1523,8 +1525,7 @@ void list_commands(bool wizard, int hotkey, bool do_redraw_screen)
             "<w>]</w> : show inventory of equipped items\n"
             "<w>v</w> : View item description\n"
             "<w>{</w> : inscribe item\n"
-            "<w>t</w> : Throw/shoot an item\n"
-            "<w>f</w> : Fire first available missile\n"
+            "<w>f</w> : Fire or throw an item\n"
             "<w>e</w> : Eat food (but tries floor first)\n"
             "<w>q</w> : Quaff a potion\n"
             "<w>z</w> : Zap a wand\n"
-- 
cgit v1.2.3-54-g00ecf