Map DEPTH handling was completely smashed, fixed.

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

4 files changed, 30 insertions, 28 deletions

diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 604b90bfe3..6bf4a80172 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -265,19 +265,19 @@ MONS: large zombie / nothing, mummy, guardian mummy, greater mummy, large zombie
 MONS: mummy / nothing
 SHUFFLE: 2F, cbv
 MAP
-xxxxxxxxxxxxxxxxxxxxxxxxxxx
-xxxxxxxxxxx3$$xxxxxxxxxxxxx
-ccxxxxxxxxccc=cccccccccxxxx
-cccxxxxxxxc.....c...1$cxxxc
-@Fcx6$.xxxc..1..c...25ccccc
+          xxxxx
+          x3$$x
+cc        ccc=ccccccccc
+cccxxxxx  c.....c...1$c   c
+@Fcx6$.x  c..1..c...25ccccc
 cccccc=cccc.62..c...15c$$$c
 @+111.....+.63..=..F11=4||c
 cccccc=cccc.62..c...15c$$$c
-@Fcx6$.xxxc..1..c...25ccccc
-cccxxxxxxxc.....c...1$cxxxc
-ccxxxxxxxxccc=cccccccccxxxx
-xxxxxxxxxxx3$$xxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxxxxx
+@Fcx6$.x  c..1..c...25ccccc
+cccxxxxx  c.....c...1$c   c
+cc        ccc=ccccccccc
+          x3$$x
+          xxxxx
 ENDMAP
 
 #############################################################################
diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des
index 9b72afdfb8..9b79ab5383 100644
--- a/crawl-ref/source/dat/orc.des
+++ b/crawl-ref/source/dat/orc.des
@@ -307,16 +307,16 @@ SUBST: ! : .$
 MAP
 x??@....@....@??x
 xx??.........??xx
-xxx??1111111??xxx
-xxxx??11111??xxxx
-xxxxx??111??xxxxx
-xxxxxx??1??xxxxxx
-xxxxxxx?2?xxxxxxx
-xxxxxxxv=vxxxxxxx
-xxxxxxx!!!xxxxxxx
-xxxxxxx!O!xxxxxxx
-xxxxxxx!!!xxxxxxx
-xxxxxxxxxxxxxxxxx
+ xx??1111111??xx
+  xx??11111??xx
+   xx??111??xx
+    xx??1??xx
+     xx?2?xx
+      xv=vx
+      x!!!x
+      x!O!x
+      x!!!x
+      xxxxx
 ENDMAP
 
 #########################
@@ -418,7 +418,7 @@ default-depth: Orc:*
 #
 NAME: mines_dummy
 TAGS: dummy
-CHANCE: 100
+CHANCE: 60
 MAP
 x
 ENDMAP
diff --git a/crawl-ref/source/luadgn.cc b/crawl-ref/source/luadgn.cc
index 2bb9150d4f..65fa69648c 100644
--- a/crawl-ref/source/luadgn.cc
+++ b/crawl-ref/source/luadgn.cc
@@ -259,14 +259,12 @@ std::string dlua_chunk::get_chunk_prefix(const std::string &sorig) const
 ///////////////////////////////////////////////////////////////////////////
 // Lua dungeon bindings (in the dgn table).
 
-static depth_ranges dgn_default_depths;
-
 #define MAP(ls, n, var)                             \
     map_def *var = *(map_def **) luaL_checkudata(ls, n, MAP_METATABLE)
 
 void dgn_reset_default_depth()
 {
-    dgn_default_depths.clear();
+    lc_default_depths.clear();
 }
 
 std::string dgn_set_default_depth(const std::string &s)
@@ -276,7 +274,7 @@ std::string dgn_set_default_depth(const std::string &s)
     {
         try
         {
-            dgn_default_depths.push_back( level_range::parse(frags[i]) );
+            lc_default_depths.push_back( level_range::parse(frags[i]) );
         }
         catch (const std::string &error)
         {
@@ -296,7 +294,7 @@ static void dgn_add_depths(depth_ranges &drs, lua_State *ls, int s, int e)
         {
             try
             {
-                dgn_default_depths.push_back( level_range::parse(frags[j]) );
+                drs.push_back( level_range::parse(frags[j]) );
             }
             catch (const std::string &error)
             {
@@ -331,7 +329,7 @@ static int dgn_depth_proc(lua_State *ls, depth_ranges &dr, int s)
 
 static int dgn_default_depth(lua_State *ls)
 {
-    return dgn_depth_proc(ls, dgn_default_depths, 1);
+    return dgn_depth_proc(ls, lc_default_depths, 1);
 }
 
 static int dgn_depth(lua_State *ls)
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 4c957c3cc9..809b278c4b 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -1221,7 +1221,11 @@ void map_def::read_depth_ranges(FILE *inf)
     depths.clear();
     const int nranges = readShort(inf);
     for (int i = 0; i < nranges; ++i)
-        depths[i].read(inf);
+    {
+        level_range lr;
+        lr.read(inf);
+        depths.push_back(lr);
+    }
 }
 
 void map_def::set_file(const std::string &s)