summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-30 23:01:30 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-30 23:01:30 +0000
commit20c12ffb9765cb79fc8483ee7651f060d8ac129e (patch)
tree109783fc3c647f229aa870e84bb97100e28ee0ec /crawl-ref/source/item_use.cc
parent729187802bdeec65565d5024b7ef0df7e53e715a (diff)
downloadcrawl-ref-20c12ffb9765cb79fc8483ee7651f060d8ac129e.tar.gz
crawl-ref-20c12ffb9765cb79fc8483ee7651f060d8ac129e.zip
Slightly better message when zapping identifies a wand [1817031]
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2695 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index d5707703d0..552e905ab8 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2995,6 +2995,14 @@ void zap_wand(void)
zapping( static_cast<zap_type>(type_zapped),
30 + roll_dice(2, you.skills[SK_EVOCATIONS]), beam );
+ // take off a charge
+ wand.plus--;
+
+ // increment zap count
+ if ( wand.plus2 >= 0 )
+ wand.plus2++;
+
+ // identify if necessary
if ((beam.obvious_effect || type_zapped == ZAP_FIREBALL) &&
!alreadyknown)
{
@@ -3006,13 +3014,6 @@ void zap_wand(void)
set_ident_type( wand.base_type, wand.sub_type, ID_TRIED_TYPE );
}
- // take off a charge
- wand.plus--;
-
- // increment zap count
- if ( wand.plus2 >= 0 )
- wand.plus2++;
-
if (item_type_known(wand)
&& (item_ident( wand, ISFLAG_KNOW_PLUSES )
|| you.skills[SK_EVOCATIONS] > 5 + random2(15)))