summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-util.cc
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-09-30 14:02:12 -0500
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-09-30 14:02:12 -0500
commitb2bd008c7bb1b47b189561411e625f3daf2c644d (patch)
tree66fa1bef046047d5883b75d15e2636a590dec687 /crawl-ref/source/spl-util.cc
parentc6ecb32c7fe5bc9b25d7cfae0d08ade76628561f (diff)
parent088bde53337992e16d041865ed3f29a251c5c55b (diff)
downloadcrawl-ref-b2bd008c7bb1b47b189561411e625f3daf2c644d.tar.gz
crawl-ref-b2bd008c7bb1b47b189561411e625f3daf2c644d.zip
Merge branch 'master' of ssh://crawl-ref.git.sourceforge.net/gitroot/crawl-ref/crawl-ref
Diffstat (limited to 'crawl-ref/source/spl-util.cc')
-rw-r--r--crawl-ref/source/spl-util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index 15e355f103..9c4860de9b 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -388,7 +388,7 @@ bool spell_sanctuary_castable(spell_type spell)
// for Xom acting (more power = more likely to grab his attention) {dlb}
int spell_mana(spell_type which_spell)
{
- if(spell_typematch(which_spell, SPTYP_CONJURATION | SPTYP_SUMMONING)
+ if(vehumet_supports_spell(which_spell)
&& you.religion == GOD_VEHUMET
&& !player_under_penance()
&& you.piety >= piety_breakpoint(3)
@@ -1003,7 +1003,7 @@ int spell_range(spell_type spell, int pow, bool real_cast, bool player_spell)
ASSERT(maxrange >= minrange);
if(player_spell
- && spell_typematch(spell, SPTYP_CONJURATION)
+ && vehumet_supports_spell(spell)
&& you.religion == GOD_VEHUMET
&& !player_under_penance()
&& you.piety >= piety_breakpoint(2))