diff options
author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-30 19:54:08 -0500 |
---|---|---|
committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-30 19:54:08 -0500 |
commit | b1b06aa17ceee679ca5fc152e934137fa23eba2c (patch) | |
tree | d3e45bcad959c43bb82b6d968aacf834304ddcf7 /crawl-ref | |
parent | 48341e27baf5540eceb2b0d8a19bd33d45ff95bc (diff) | |
download | crawl-ref-b1b06aa17ceee679ca5fc152e934137fa23eba2c.tar.gz crawl-ref-b1b06aa17ceee679ca5fc152e934137fa23eba2c.zip |
Add minor cosmetic fixes.
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/religion.cc | 5 | ||||
-rw-r--r-- | crawl-ref/source/spl-util.cc | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 22b55c1f0a..37930c052a 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -4287,10 +4287,13 @@ bool vehumet_supports_spell(spell_type spell) { if (spell_typematch(spell, SPTYP_CONJURATION | SPTYP_SUMMONING)) return (true); + if (spell == SPELL_SHATTER - || spell == SPELL_FRAGMENTATION + || spell == SPELL_FRAGMENTATION || spell == SPELL_SANDBLAST) + { return (true); + } return (false); } diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc index 05c623631c..e250f55931 100644 --- a/crawl-ref/source/spl-util.cc +++ b/crawl-ref/source/spl-util.cc @@ -968,7 +968,7 @@ bool is_valid_spell(spell_type spell) static bool _cloud_helper(cloud_func func, const coord_def& where, int pow, int spread_rate, cloud_type ctype, kill_category whose, - killer_type killer ) + killer_type killer) { if (!grid_is_solid(grd(where)) && env.cgrid(where) == EMPTY_CLOUD) { @@ -991,22 +991,22 @@ int spell_range(spell_type spell, int pow, bool real_cast, bool player_spell) ASSERT(maxrange >= minrange); // Sandblast is a special case. - if ((spell == SPELL_SANDBLAST) && wielding_rocks()) + if (spell == SPELL_SANDBLAST && wielding_rocks()) { minrange++; maxrange++; } - if(player_spell + if (player_spell && vehumet_supports_spell(spell) && you.religion == GOD_VEHUMET && !player_under_penance() && you.piety >= piety_breakpoint(2)) { - if(maxrange < LOS_RADIUS) + if (maxrange < LOS_RADIUS) maxrange++; - if(minrange < LOS_RADIUS) + if (minrange < LOS_RADIUS) minrange++; } @@ -1019,7 +1019,7 @@ int spell_range(spell_type spell, int pow, bool real_cast, bool player_spell) return maxrange; // Round appropriately. - return ((pow*(maxrange - minrange) + powercap/2) / powercap + minrange); + return ((pow * (maxrange - minrange) + powercap / 2) / powercap + minrange); } int spell_noise(spell_type spell) |