summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells2.cc
diff options
context:
space:
mode:
authorCharles Otto <ottochar@gmail.com>2009-10-16 15:17:02 -0400
committerCharles Otto <ottochar@gmail.com>2009-10-16 17:12:31 -0400
commitd5c9626b31d13b7e3b180603f72b93910679ba30 (patch)
treefae326e3ab5e0b87aaf6427057531ab2f9471b8f /crawl-ref/source/spells2.cc
parent67daccbb0e957159e2d411e95f652440cf612807 (diff)
downloadcrawl-ref-d5c9626b31d13b7e3b180603f72b93910679ba30.tar.gz
crawl-ref-d5c9626b31d13b7e3b180603f72b93910679ba30.zip
Let Feawn's rain ability place deep water again (oops).
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r--crawl-ref/source/spells2.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index cec9e6ce30..9bc1681695 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -2299,6 +2299,16 @@ int rain(coord_def & target)
if (mon && mon->has_ench(ENCH_AQUATIC_LAND))
mon->del_ench(ENCH_AQUATIC_LAND);
}
+ // We can also turn shallow water into deep water, but we're
+ // just going to skip cases where there is something on the
+ // shallow water. Destroying items will probably be annoying,
+ // and insta-killing monsters is clearly out of the question.
+ else if (!actor_at(*rad)
+ && igrd(*rad) == NON_ITEM
+ && ftype == DNGN_SHALLOW_WATER)
+ {
+ grd(*rad) = DNGN_DEEP_WATER;
+ }
if (ftype >= DNGN_MINMOVE)
{
@@ -2317,16 +2327,6 @@ int rain(coord_def & target)
}
- // We can also turn shallow water into deep water, but we're
- // just going to skip cases where there is something on the
- // shallow water. Destroying items will probably be annoying,
- // and insta-killing monsters is clearly out of the question.
- else if (!actor_at(*rad)
- && igrd(*rad) == NON_ITEM
- && ftype == DNGN_SHALLOW_WATER)
- {
- grd(*rad) = DNGN_DEEP_WATER;
- }
}
if (spawned_count > 0)