summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-10 13:44:40 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-10 13:44:40 +0000
commit880cd5a90a6ab9e5c7cc5bc84d03fa0c8827f800 (patch)
tree564424003240441ca10e290f1c754cdbd72093f9 /crawl-ref/source/item_use.cc
parent5e7882be38147d8cce931baa61a9c9d868c3576a (diff)
downloadcrawl-ref-880cd5a90a6ab9e5c7cc5bc84d03fa0c8827f800.tar.gz
crawl-ref-880cd5a90a6ab9e5c7cc5bc84d03fa0c8827f800.zip
Add more orc speech, courtesy of David.
Add "neutral" prefix for speech lookup, currently unused. (One of these days I'll need to update monster_speech.txt *yet again*.) Also: tweak modification scroll prompt to "Use on which item?" as suggested by Eino in BR 1910782. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3579 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index cd897e8cb3..077f6604f5 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -4024,10 +4024,14 @@ static void handle_read_book( int item_slot )
}
}
-// returns true if the scroll had an obvious effect and should be identified
+// For unidentified scrolls of recharging, identify and enchant armour
+// offer full choice of inventory and only identify the scroll if you chose
+// something that is affected by the scroll. Once they're identified, you'll
+// get the limited inventory listing.
+// Returns true if the scroll had an obvious effect and should be identified.
static bool scroll_modify_item(const scroll_type scroll)
{
- int item_slot = prompt_invent_item( "Modify which item?", MT_INVLIST,
+ int item_slot = prompt_invent_item( "Use on which item?", MT_INVLIST,
OSEL_ANY, true, true, false );
if (item_slot == PROMPT_ABORT)
@@ -4041,6 +4045,8 @@ static bool scroll_modify_item(const scroll_type scroll)
switch (scroll)
{
case SCR_IDENTIFY:
+ // This can cause a stupid situation where you try to identify the
+ // very scroll you just read, causing you to waste the scroll.
if ( !fully_identified(item) )
{
mpr("This is a scroll of identify!");