summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/abyss.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-19 19:04:23 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-19 19:04:23 +0000
commit2817900512f1f92a5d8738723373ab378fd1d6e5 (patch)
treebe26e14a39ad8bafe9b5a63b48b01ebb8772d9c2 /crawl-ref/source/abyss.cc
parentaf7b69fc5936d24c9ee0bbb5bc787cb194f7c26f (diff)
downloadcrawl-ref-2817900512f1f92a5d8738723373ab378fd1d6e5.tar.gz
crawl-ref-2817900512f1f92a5d8738723373ab378fd1d6e5.zip
Add yet more Jiyva-related cleanups. Make sure his altars are never
generated if the royal jelly is dead, you don't worship Jiyva, and you're not under penance from Jiyva; don't destroy Jiyva's altars if the royal jelly dies after you start worshipping him or go under penance from him; and clean up the alternate method for unlocking the Slime Pits. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10332 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abyss.cc')
-rw-r--r--crawl-ref/source/abyss.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index cdc11b55eb..b4136e8ba2 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -305,7 +305,9 @@ static void _generate_area(const coord_def& topleft,
}
while (grd(*ri) == DNGN_ALTAR_ZIN
|| grd(*ri) == DNGN_ALTAR_SHINING_ONE
- || grd(*ri) == DNGN_ALTAR_ELYVILON);
+ || grd(*ri) == DNGN_ALTAR_ELYVILON
+ || (jiyva_is_dead() ?
+ grd(*ri) == DNGN_ALTAR_JIYVA : false));
// Lugonu has a flat 50% chance of corrupting the altar.
if (coinflip())