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-04-16 15:04:59 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-16 15:04:59 +0000
commitbf6b4b21ccc66c8e458ee433add5741ec90e5d87 (patch)
tree08e3eb61ddf3126d1fcb71dac02a7c7096837eea /crawl-ref/source/item_use.cc
parent1f328a8c326b0a2ff99dbf776b17b7375cb8061b (diff)
downloadcrawl-ref-bf6b4b21ccc66c8e458ee433add5741ec90e5d87.tar.gz
crawl-ref-bf6b4b21ccc66c8e458ee433add5741ec90e5d87.zip
Fix 1933066: Ghosts not being poison resistant.
Fix part of 1940994: Identify scrolls now get properly identified if applied on an unID'd item right away, so that if you get more rounds it isn't offered to you *again*. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4257 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 2d8956fcd8..ce4071cfca 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -3895,8 +3895,10 @@ bool enchant_armour( int &ac_change, bool quiet, item_def &arm )
static bool _handle_enchant_armour( int item_slot )
{
if (item_slot == -1)
+ {
item_slot = prompt_invent_item( "Enchant which item?", MT_INVLIST,
OSEL_ENCH_ARM, true, true, false );
+ }
if (item_slot == -1)
{
@@ -3982,6 +3984,7 @@ static bool scroll_modify_item(const scroll_type scroll)
if ( !fully_identified(item) )
{
mpr("This is a scroll of identify!");
+ set_ident_type( OBJ_SCROLLS, SCR_IDENTIFY, ID_KNOWN_TYPE );
identify(-1, item_slot);
return (true);
}