summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 9d16c2914a..32be70e0d3 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -3554,6 +3554,9 @@ void zap_wand( int slot )
// Take off a charge.
wand.plus--;
+ // Zap counts count from the last recharge.
+ if (wand.plus2 == ZAPCOUNT_RECHARGED)
+ wand.plus2 = 0;
// Increment zap count.
if (wand.plus2 >= 0)
wand.plus2++;
@@ -4057,9 +4060,9 @@ bool enchant_armour( int &ac_change, bool quiet, item_def &arm )
arm.name(DESC_CAP_YOUR).c_str());
}
- ac_change = arm.plus;
+ ac_change = property(arm, PARM_AC);
hide2armour(arm);
- ac_change = arm.plus - ac_change;
+ ac_change = property(arm, PARM_AC) - ac_change;
if (is_cursed)
do_uncurse_item( arm );