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>2009-05-14 14:34:31 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-05-14 14:34:31 +0000
commit77398364e73bee6487c9ae0006144d03ba90ada0 (patch)
tree2ce7d85c334dab8992e474ac9b31a3c3b58c4dd5 /crawl-ref/source/item_use.cc
parent4153ebb74a9cbcdb20f904f61ec3f77e8438c507 (diff)
downloadcrawl-ref-77398364e73bee6487c9ae0006144d03ba90ada0.tar.gz
crawl-ref-77398364e73bee6487c9ae0006144d03ba90ada0.zip
Modify ?v to read in the list of changed command keys.
Modify version highlights. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9765 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index a00ebe3ea4..596e1c7374 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -4963,16 +4963,12 @@ void read_scroll(int slot)
break;
case SCR_IMMOLATION:
- {
mpr("The scroll explodes in your hands!");
- // We do this here to prevent it from blowing itself up.
- set_ident_type(scroll, ID_KNOWN_TYPE);
- dec_inv_item_quantity(item_slot, 1);
+ // Doesn't destroy scrolls anymore, so no special check needed. (jpeg)
immolation(10, IMMOLATION_SCROLL, you.pos(), alreadyknown, &you);
bad_effect = true;
break;
- }
case SCR_CURSE_WEAPON:
if (!you.weapon()
@@ -5175,8 +5171,7 @@ void read_scroll(int slot)
: ID_TRIED_TYPE);
// Finally, destroy and identify the scroll.
- // Scrolls of immolation were already destroyed earlier.
- if (which_scroll != SCR_PAPER && which_scroll != SCR_IMMOLATION)
+ if (which_scroll != SCR_PAPER)
{
if (id_the_scroll)
set_ident_flags(scroll, ISFLAG_KNOW_TYPE); // for notes