summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-book.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-05-31 23:14:28 -0400
committerNeil Moore <neil@s-z.org>2014-05-31 23:14:29 -0400
commit1c26d996b4be436285edc2092e1282da8cf0ec13 (patch)
tree32e43b7c85d00b887809e602d1d900044eb6e1bc /crawl-ref/source/spl-book.cc
parent7ec533578637a75973e718e236289985149858bc (diff)
downloadcrawl-ref-1c26d996b4be436285edc2092e1282da8cf0ec13.tar.gz
crawl-ref-1c26d996b4be436285edc2092e1282da8cf0ec13.zip
Use the correct skill in variable-range rod spells (#8307)
For the purposes of the hostile-in-range check and darken_beyond_range, we were computing power using the spell schools rather than Evocations.
Diffstat (limited to 'crawl-ref/source/spl-book.cc')
-rw-r--r--crawl-ref/source/spl-book.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 7d479cbc42..f7d25d46c4 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -1380,7 +1380,7 @@ int rod_spell(int rod, bool check_range)
return -1;
}
- if (check_range && spell_no_hostile_in_range(spell))
+ if (check_range && spell_no_hostile_in_range(spell, true))
{
// Abort if there are no hostiles within range, but flash the range
// markers for a short while.
@@ -1389,7 +1389,7 @@ int rod_spell(int rod, bool check_range)
if (Options.darken_beyond_range)
{
- targetter_smite range(&you, calc_spell_range(spell), 0, 0, true);
+ targetter_smite range(&you, calc_spell_range(spell, 0, true), 0, 0, true);
range_view_annotator show_range(&range);
delay(50);
}