summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2006-09-22 23:05:25 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2006-09-22 23:05:25 +0000
commit75a312ec7da5106ff2033e557257afd6911cc826 (patch)
treedc0a64e6a64ae7ca163d8d6382c66bae41e76ed7
parent39b870dee9ebc66763223eb373e877783d7adcd4 (diff)
downloadcrawl-ref-75a312ec7da5106ff2033e557257afd6911cc826.tar.gz
crawl-ref-75a312ec7da5106ff2033e557257afd6911cc826.zip
Scrolls of immolation cannot burn themselves.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@84 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/item_use.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 45f65436ed..65f7ee2d58 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -3102,6 +3102,8 @@ void read_scroll(void)
case SCR_IMMOLATION:
mpr("The scroll explodes in your hands!");
+ // we do this here to prevent it from blowing itself up
+ dec_inv_item_quantity( item_slot, 1 );
beam.type = SYM_BURST;
beam.damage = dice_def( 3, 10 );
@@ -3277,7 +3279,8 @@ void read_scroll(void)
} // end switch
// finally, destroy and identify the scroll
- if (scroll_type != SCR_PAPER)
+ // scrolls of immolation were already destroyed earlier
+ if (scroll_type != SCR_PAPER && scroll_type != SCR_IMMOLATION)
{
dec_inv_item_quantity( item_slot, 1 );
}