Place external loot chamber for ziggurat levels with jellies.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7625 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 14 insertions, 1 deletions

diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index 062439163b..1549039ee0 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -30,6 +30,9 @@
 #include "stuff.h"
 #include "terrain.h"
 
+static bool bad_map_place(const map_def &map, const coord_def &c,
+                          const coord_def &size);
+
 static int write_vault(map_def &mdef,
                        vault_placement &,
                        bool check_place);
@@ -40,6 +43,13 @@ static int apply_vault_definition(
 
 static bool resolve_map(map_def &def);
 
+// Globals: Use unwind_var to modify!
+
+// Checks whether a map place is valid.
+map_place_check_t map_place_invalid = bad_map_place;
+
+// If non-empty, any floating vault's @ exit must land on these point.
+point_vector map_anchor_points;
 
 //////////////////////////////////////////////////////////////////////////
 // New style vault definitions
@@ -247,7 +257,10 @@ static bool apply_vault_grid(map_def &def,
             start = def.float_place();
     }
 
-    if (check_place && bad_map_place(def, start, size))
+    if (!map_bounds(start))
+        return (false);
+
+    if (check_place && map_place_invalid(def, start, size))
     {
 #ifdef DEBUG_DIAGNOSTICS
         mprf(MSGCH_DIAGNOSTICS, "Bad vault place: (%d,%d) dim (%d,%d)",