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

1 files changed, 5 insertions, 0 deletions

diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index cb460903fb..520e02fc02 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -837,6 +837,7 @@ static void tag_construct_you(writer &th)
     marshallByte(th, you.where_are_you);
     marshallByte(th, you.char_direction);
     marshallByte(th, you.opened_zot);
+    marshallByte(th, you.royal_jelly_dead);
     marshallByte(th, you.your_level);
     marshallByte(th, you.is_undead);
     marshallShort(th, you.unrand_reacts);
@@ -1252,9 +1253,13 @@ static void tag_read_you(reader &th, char minorVersion)
     you.max_level         = unmarshallByte(th);
     you.where_are_you     = static_cast<branch_type>( unmarshallByte(th) );
     you.char_direction    = static_cast<game_direction_type>(unmarshallByte(th));
+
     if (minorVersion >= TAG_MINOR_ZOT_OPEN)
         you.opened_zot = (bool) unmarshallByte(th);
 
+    if (minorVersion >= TAG_MINOR_JELLY)
+        you.royal_jelly_dead = (bool) unmarshallByte(th);
+
     you.your_level        = unmarshallByte(th);
     you.is_undead         = static_cast<undead_state_type>(unmarshallByte(th));
     you.unrand_reacts     = unmarshallShort(th);