Get rid of level_type, unify BRANCH_*, LEVEL_* and portal vaults.

1 files changed, 2 insertions, 16 deletions

diff --git a/crawl-ref/source/dbg-maps.cc b/crawl-ref/source/dbg-maps.cc
index 1f027dbca8..6260be13f3 100644
--- a/crawl-ref/source/dbg-maps.cc
+++ b/crawl-ref/source/dbg-maps.cc
@@ -52,7 +52,7 @@ void mapgen_report_map_veto()
 static bool _mg_is_disconnected_level()
 {
     // Don't care about non-Dungeon levels.
-    if (you.level_type != LEVEL_DUNGEON
+    if (!player_in_connected_branch()
         || (branches[you.where_are_you].branch_flags & BFLAG_ISLANDED))
         return (false);
 
@@ -83,7 +83,7 @@ static bool mg_do_build_level(int niters)
         }
 
         ++mg_levels_tried;
-        if (!builder(you.absdepth0, you.level_type))
+        if (!builder(you.absdepth0, you.where_are_you))
         {
             ++mg_levels_failed;
             continue;
@@ -152,12 +152,6 @@ static std::vector<level_id> mg_dungeon_places()
         for (int depth = 1; depth <= branches[br].depth; ++depth)
             places.push_back(level_id(branch, depth));
     }
-
-    places.push_back(LEVEL_ABYSS);
-    places.push_back(LEVEL_LABYRINTH);
-    places.push_back(LEVEL_PANDEMONIUM);
-    places.push_back(LEVEL_PORTAL_VAULT);
-
     return (places);
 }
 
@@ -170,9 +164,6 @@ static bool mg_build_dungeon()
         const level_id &lid = places[i];
         you.absdepth0 = absdungeon_depth(lid.branch, lid.depth);
         you.where_are_you = lid.branch;
-        you.level_type = lid.level_type;
-        if (you.level_type == LEVEL_PORTAL_VAULT)
-            you.level_type_tag = you.level_type_name = "bazaar";
         if (!mg_do_build_level(1))
             return (false);
     }
@@ -284,11 +275,6 @@ static void _write_mapgen_stats()
         }
     }
 
-    _check_mapless(level_id(LEVEL_ABYSS), mapless);
-    _check_mapless(level_id(LEVEL_PANDEMONIUM), mapless);
-    _check_mapless(level_id(LEVEL_LABYRINTH), mapless);
-    _check_mapless(level_id(LEVEL_PORTAL_VAULT), mapless);
-
     if (!mapless.empty())
     {
         fprintf(outf, "\n\nLevels with no maps:\n");