From 6f2528d6b90c86b44e8265c382e182835e20722d Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rvollmert@gmx.net>
Date: Fri, 27 Nov 2009 13:09:02 +0100
Subject: Also veto dungeon if second stair fixup attempt failed.

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

(limited to 'crawl-ref/source')

diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index abdee2f3b3..89f4ca2773 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -1599,7 +1599,16 @@ static void _dgn_verify_connectivity(unsigned nvaults)
 #ifdef DEBUG_DIAGNOSTICS
         mprf(MSGCH_DIAGNOSTICS, "Warning: failed to preserve vault stairs.");
 #endif
-        _fixup_stone_stairs(false);
+        if (!_fixup_stone_stairs(false))
+        {
+            dgn_level_vetoed = true;
+#ifdef DEBUG_DIAGNOSTICS
+            mprf(MSGCH_DIAGNOSTICS,
+                 "VETO: Failed to fix stone stairs: %s.",
+                 level_id::current().describe().c_str());
+#endif
+            return;
+        }
     }
 
     if (!_branch_entrances_are_connected())
-- 
cgit v1.2.3-54-g00ecf