Fixed labyrinth sizes for trunk.

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

2 files changed, 9 insertions, 7 deletions

diff --git a/crawl-ref/source/defines.h b/crawl-ref/source/defines.h
index d13910e61c..823f9cbca1 100644
--- a/crawl-ref/source/defines.h
+++ b/crawl-ref/source/defines.h
@@ -82,7 +82,9 @@
 
 // This is the border that must be left around the map. I'm not sure why it's
 // necessary, beyond hysterical raisins.
-#define MAPGEN_BORDER           2
+const int MAPGEN_BORDER    = 2;
+
+const int LABYRINTH_BORDER = 12;
 
 // Now some defines about the actual play area:
 // Note: these boundaries are exclusive for the zone the player can move/dig,
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 2b40d2d834..abeb5e4ad5 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -5849,8 +5849,8 @@ static void init_minivault_placement(int vault, vault_placement &place)
 
 static void labyrinth_dimension_adjust(int delta, int &ds, int &dw)
 {
-    if (delta > MAPGEN_BORDER)
-        delta = MAPGEN_BORDER;
+    if (delta > LABYRINTH_BORDER / 2)
+        delta = LABYRINTH_BORDER / 2;
 
     if (delta)
     {
@@ -6040,10 +6040,10 @@ static void labyrinth_place_entry_point(const dgn_region &region,
 static void labyrinth_level(int level_number)
 {
     dgn_region lab =
-        dgn_region::absolute( MAPGEN_BORDER * 2,
-                              MAPGEN_BORDER * 2,
-                              GXM - MAPGEN_BORDER * 2 - 1,
-                              GYM - MAPGEN_BORDER * 2 - 1 );
+        dgn_region::absolute( LABYRINTH_BORDER,
+                              LABYRINTH_BORDER,
+                              GXM - LABYRINTH_BORDER - 1,
+                              GYM - LABYRINTH_BORDER - 1 );
     
     // First decide if we're going to use a Lab minivault.
     int vault = random_map_for_tag("minotaur", true, false);