diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-20 07:00:21 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-20 07:00:21 +0000 |
| commit | 160877d2419830c4989516e9a09fa6260a052d42 (patch) | |
| tree | 619442ec7224ae7289221d0876ae9b1d6bf59c2b /crawl-ref/source/effects.cc | |
| parent | e1879031547aa6861a565563724d7308d02cc2f2 (diff) | |
| download | crawl-ref-160877d2419830c4989516e9a09fa6260a052d42.tar.gz crawl-ref-160877d2419830c4989516e9a09fa6260a052d42.zip | |
* Add Shock/Lightning Bolt to list of spells that don't abort for 'z' if
there are no monsters within range.
* Give a message if extending a transformation doesn't make it last long
enough for the "about to time out" message.
* Extension has no effect on Bat Form.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9794 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
| -rw-r--r-- | crawl-ref/source/effects.cc | 10 |
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. { |