diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-23 07:54:37 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-23 07:54:37 +0000 |
| commit | 361fb119f59f5879b115ec1dc050fe84b7381670 (patch) | |
| tree | bc1992af6fc973debb99c5232e5507ff177c187d /crawl-ref/source/spl-cast.cc | |
| parent | bb594fc95044847b4835dcc43b9ae3ec726272d8 (diff) | |
| download | crawl-ref-361fb119f59f5879b115ec1dc050fe84b7381670.tar.gz crawl-ref-361fb119f59f5879b115ec1dc050fe84b7381670.zip | |
Fixed surges being all wrong (1705614.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1345 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 7a3f84d2dd..f617790e4e 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -106,14 +106,14 @@ static bool surge_identify_boosters(int spell) return false; } -static void surge_power(int spell) +static void surge_power(spell_type spell) { int enhanced = 0; surge_identify_boosters(spell); //jmf: simplified - enhanced += spell_enhancement(spell_type(spell)); + enhanced += spell_enhancement(get_spell_disciplines(spell)); if (enhanced) // one way or the other {dlb} { @@ -468,7 +468,7 @@ int spell_fail(spell_type spell) } // end spell_fail() -int calc_spell_power( int spell, bool apply_intel, bool fail_rate_check ) +int calc_spell_power(spell_type spell, bool apply_intel, bool fail_rate_check) { unsigned int bit; int ndx; @@ -480,7 +480,7 @@ int calc_spell_power( int spell, bool apply_intel, bool fail_rate_check ) + (fail_rate_check? 0 : player_mag_abil(false)); int enhanced = 0; - unsigned int disciplines = spell_type( spell ); + unsigned int disciplines = get_spell_disciplines( spell ); //jmf: evil evil evil -- exclude HOLY bit disciplines &= (~SPTYP_HOLY); |