summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 74ca4db599..e76c01bc0d 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1933,9 +1933,6 @@ bool recharge_wand(int item_slot)
{
charge_gain = wand_charge_value(wand.sub_type);
- // Reinitialize zap counts.
- wand.plus2 = ZAPCOUNT_RECHARGED;
-
const int new_charges =
std::max<int>(
wand.plus,
@@ -1959,10 +1956,9 @@ bool recharge_wand(int item_slot)
charged ? "glows" : "flickers",
desc.c_str());
- wand.plus = new_charges;
-
- if (!charged)
- wand.plus2 = ZAPCOUNT_MAX_CHARGED;
+ // Reinitialize zap counts.
+ wand.plus = new_charges;
+ wand.plus2 = (charged ? ZAPCOUNT_RECHARGED : ZAPCOUNT_MAX_CHARGED);
}
else // It's a rod.
{