From 657c92b43571bd0d7be48cbc8893ee3eb6bc056c Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <dolorous@users.sourceforge.net>
Date: Fri, 6 Nov 2009 01:50:17 -0600
Subject: Ensure that, if Jiyva is dead, no Jiyva altars can be placed in
 vaults.

---
 crawl-ref/source/l_dgngrd.cc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/crawl-ref/source/l_dgngrd.cc b/crawl-ref/source/l_dgngrd.cc
index e500326136..ed8e1aed9b 100644
--- a/crawl-ref/source/l_dgngrd.cc
+++ b/crawl-ref/source/l_dgngrd.cc
@@ -12,6 +12,7 @@
 #include "coord.h"
 #include "directn.h"
 #include "env.h"
+#include "religion.h"
 #include "terrain.h"
 
 const char *dngn_feature_names[] =
@@ -69,8 +70,15 @@ dungeon_feature_type dungeon_feature_by_name(const std::string &name)
         return (DNGN_UNSEEN);
 
     for (unsigned i = 0; i < ARRAYSZ(dngn_feature_names); ++i)
+    {
         if (dngn_feature_names[i] == name)
-            return static_cast<dungeon_feature_type>(i);
+        {
+            if (jiyva_is_dead() && name == "altar_jiyva")
+                return (DNGN_FLOOR);
+
+            return (static_cast<dungeon_feature_type>(i));
+        }
+    }
 
     return (DNGN_UNSEEN);
 }
-- 
cgit v1.2.3-54-g00ecf