summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-cast.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-09 16:04:47 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-09 16:04:47 +0000
commitb174cc45ae14a2bbf69000d2f1293b1eec4b4952 (patch)
tree8d40dd45a5849b91a839ca8e3666e8fd2dd85aa1 /crawl-ref/source/spl-cast.cc
parent05a13a2e67f67dec08be00a23289cf576524cde0 (diff)
downloadcrawl-ref-b174cc45ae14a2bbf69000d2f1293b1eec4b4952.tar.gz
crawl-ref-b174cc45ae14a2bbf69000d2f1293b1eec4b4952.zip
Fix spell power caps not being respected (looks like a long-standing bug.)
Code quality improvements for Twist. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8358 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
-rw-r--r--crawl-ref/source/spl-cast.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 0ebd18eeed..dbd3d381cc 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -497,8 +497,12 @@ int calc_spell_power(spell_type spell, bool apply_intel, bool fail_rate_check)
power = stepdown_value( power, 50, 50, 150, 200 );
+ const int cap = spell_power_cap(spell);
+ if (cap > 0)
+ power = std::min(power, cap);
+
return (power);
-} // end calc_spell_power()
+}
int spell_enhancement( unsigned int typeflags )
@@ -1444,7 +1448,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
break;
case SPELL_TWIST:
- cast_twist(powc);
+ cast_twist(powc, beam.target);
break;
case SPELL_AIRSTRIKE: