diff options
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index f05b6712b1..e9fd5b564e 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -880,13 +880,16 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail ) return (SPRET_ABORT); } } - + + // enhancers only matter for calc_spell_power() and spell_fail() + // not sure about this: is it flavour or misleading? + if (powc == 0 || allow_fail) + surge_power(spell); + // Added this so that the passed in powc can have meaning -- bwr if (powc == 0) powc = calc_spell_power( spell, true ); - surge_power(spell); - if (allow_fail) { int spfl = random2avg(100, 3); @@ -1185,7 +1188,8 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail ) summon_small_mammals(powc); //jmf: hmm, that's definitely *plural* ;-) break; - case SPELL_ABJURATION_I: //jmf: why not group with SPELL_ABJURATION_II? + case SPELL_ABJURATION_I: + case SPELL_ABJURATION_II: abjuration(powc); break; @@ -1373,10 +1377,6 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail ) summon_ice_beast_etc(powc, MONS_DAEVA); break; - case SPELL_ABJURATION_II: - abjuration(powc); - break; - // Remember that most holy spells above don't yet use powc! case SPELL_TWISTED_RESURRECTION: |