Preliminary refactoring in dungeon creation code.

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

4 files changed, 180 insertions, 174 deletions

diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc
index a6178217de..b0fcfe9c0e 100644
--- a/crawl-ref/source/branch.cc
+++ b/crawl-ref/source/branch.cc
@@ -12,7 +12,7 @@ Branch branches[] = {
       NUM_FEATURES, NUM_FEATURES,  // sentinel values
       "Dungeon", "the Dungeon", "D",
       NULL,
-      LIGHTGREY, BROWN,
+      true, true, LIGHTGREY, BROWN,
       mons_standard_rare, mons_standard_level, NULL,
       8, 'D'
     },
@@ -21,14 +21,15 @@ Branch branches[] = {
       DNGN_ENTER_TEMPLE, DNGN_RETURN_FROM_TEMPLE,
       "Temple", "the Ecumenical Temple", "Temple",
       NULL,
-      LIGHTGREY, LIGHTGREY, mons_standard_rare, mons_standard_level, NULL, 
+      false, false, LIGHTGREY, LIGHTGREY,
+      mons_standard_rare, mons_standard_level, NULL, 
       0, 'T' },
 
     { BRANCH_ORCISH_MINES, BRANCH_MAIN_DUNGEON, 4, 6,
       DNGN_ENTER_ORCISH_MINES, DNGN_RETURN_FROM_ORCISH_MINES,
       "Orcish Mines", "the Orcish Mines", "Orc",
       NULL,
-      BROWN, BROWN,
+      true, false, BROWN, BROWN,
       mons_mineorc_rare, mons_mineorc_level, NULL,
       20, 'O' },
 
@@ -36,49 +37,56 @@ Branch branches[] = {
       DNGN_ENTER_ELVEN_HALLS, DNGN_RETURN_FROM_ELVEN_HALLS,
       "Elven Halls", "the Elven Halls", "Elf",
       NULL,
-      DARKGREY, LIGHTGREY, mons_hallelf_rare, mons_hallelf_level, NULL,
+      true, true, DARKGREY, LIGHTGREY,
+      mons_hallelf_rare, mons_hallelf_level, NULL,
       8, 'E' },
 
     { BRANCH_LAIR, BRANCH_MAIN_DUNGEON, 10, 8,
       DNGN_ENTER_LAIR, DNGN_RETURN_FROM_LAIR,
       "Lair", "the Lair of Beasts", "Lair",
       NULL,
-      GREEN, BROWN, mons_lair_rare, mons_lair_level, NULL,
+      true, false, GREEN, BROWN,
+      mons_lair_rare, mons_lair_level, NULL,
       5, 'L' },
 
     { BRANCH_SWAMP, BRANCH_LAIR, 5, 3,
       DNGN_ENTER_SWAMP, DNGN_RETURN_FROM_SWAMP,
       "Swamp", "the Swamp", "Swamp",
       NULL,
-      BROWN, BROWN, mons_swamp_rare, mons_swamp_level, NULL, 
+      true, true, BROWN, BROWN,
+      mons_swamp_rare, mons_swamp_level, NULL, 
       0, 'S' },
 
     { BRANCH_SLIME_PITS, BRANCH_LAIR, 6, 4,
       DNGN_ENTER_SLIME_PITS, DNGN_RETURN_FROM_SLIME_PITS,
       "Slime Pits", "the Pits of Slime", "Slime",
       NULL,
-      GREEN, LIGHTGREEN, mons_pitslime_rare, mons_pitslime_level, NULL,
+      false, false, GREEN, LIGHTGREEN,
+      mons_pitslime_rare, mons_pitslime_level, NULL,
       5, 'M' },
 
     { BRANCH_SNAKE_PIT, BRANCH_LAIR, 5, 7,
       DNGN_ENTER_SNAKE_PIT, DNGN_RETURN_FROM_SNAKE_PIT,
       "Snake Pit", "the Snake Pit", "Snake",
       NULL,
-      LIGHTGREEN, YELLOW, mons_pitsnake_rare, mons_pitsnake_level, NULL,
+      true, true, LIGHTGREEN, YELLOW,
+      mons_pitsnake_rare, mons_pitsnake_level, NULL,
       10, 'P' },
 
     { BRANCH_HIVE, BRANCH_MAIN_DUNGEON, 4, 15,
       DNGN_ENTER_HIVE, DNGN_RETURN_FROM_HIVE,
       "Hive", "the Hive", "Hive",
       "You hear a buzzing sound coming from all directions.",
-      YELLOW, BROWN, mons_hive_rare, mons_hive_level, NULL, 
+      false, false, YELLOW, BROWN,
+      mons_hive_rare, mons_hive_level, NULL, 
       0, 'H' },
 
     { BRANCH_VAULTS, BRANCH_MAIN_DUNGEON, 8, 17,
       DNGN_ENTER_VAULTS, DNGN_RETURN_FROM_VAULTS,
       "Vaults", "the Vaults", "Vault",
       NULL,
-      LIGHTGREY, BROWN, mons_standard_rare, mons_standard_level, NULL,
+      true, true, LIGHTGREY, BROWN,
+      mons_standard_rare, mons_standard_level, NULL,
       5, 'V' },
 
 
@@ -86,28 +94,31 @@ Branch branches[] = {
       DNGN_ENTER_HALL_OF_BLADES, DNGN_RETURN_FROM_HALL_OF_BLADES,
       "Hall of Blades", "the Hall of Blades", "Blade",
       NULL,
-      LIGHTGREY, LIGHTGREY, mons_hallblade_rare, mons_hallblade_level, NULL, 
+      false, true, LIGHTGREY, LIGHTGREY,
+      mons_hallblade_rare, mons_hallblade_level, NULL, 
       0, 'B' },
 
     { BRANCH_CRYPT, BRANCH_VAULTS, 5, 3,
       DNGN_ENTER_CRYPT, DNGN_RETURN_FROM_CRYPT,
       "Crypt", "the Crypt", "Crypt",
       NULL,
-      LIGHTGREY, LIGHTGREY, mons_crypt_rare, mons_crypt_level, NULL,
+      false, true, LIGHTGREY, LIGHTGREY,
+      mons_crypt_rare, mons_crypt_level, NULL,
       5, 'C' },
 
     { BRANCH_TOMB, BRANCH_CRYPT, 3, 5,
       DNGN_ENTER_TOMB, DNGN_RETURN_FROM_TOMB,
       "Tomb", "the Tomb of the Ancients", "Tomb",
       NULL,
-      YELLOW, LIGHTGREY, mons_tomb_rare, mons_tomb_level, NULL, 
+      false, true, YELLOW, LIGHTGREY,
+      mons_tomb_rare, mons_tomb_level, NULL, 
       0, 'G' },
 
     { BRANCH_VESTIBULE_OF_HELL, BRANCH_MAIN_DUNGEON, 1, -1,
       DNGN_ENTER_HELL, NUM_FEATURES, // sentinel
       "Hell", "The Vestibule of Hell", "Hell",
       NULL,
-      LIGHTGREY, LIGHTGREY,
+      false, true, LIGHTGREY, LIGHTGREY,
       mons_standard_rare, mons_standard_level, NULL,
       0, 'U'
     },
@@ -116,7 +127,7 @@ Branch branches[] = {
       DNGN_ENTER_DIS, NUM_FEATURES, // sentinel
       "Dis", "the Iron City of Dis", "Dis",
       NULL,
-      CYAN, CYAN,
+      false, false, CYAN, CYAN,
       mons_dis_rare, mons_dis_level, NULL,
       0, 'I'
     },
@@ -125,7 +136,7 @@ Branch branches[] = {
       DNGN_ENTER_GEHENNA, NUM_FEATURES, // sentinel
       "Gehenna", "Gehenna", "Geh",
       NULL,
-      DARKGREY, RED,
+      false, false, DARKGREY, RED,
       mons_gehenna_rare, mons_gehenna_level, NULL,
       0, 'N'
     },
@@ -134,7 +145,7 @@ Branch branches[] = {
       DNGN_ENTER_COCYTUS, NUM_FEATURES, // sentinel
       "Cocytus", "Cocytus", "Coc",
       NULL,
-      LIGHTBLUE, LIGHTCYAN,
+      false, false, LIGHTBLUE, LIGHTCYAN,
       mons_cocytus_rare, mons_cocytus_level, NULL,
       0, 'X'
     },
@@ -143,7 +154,7 @@ Branch branches[] = {
       DNGN_ENTER_TARTARUS, NUM_FEATURES, // sentinel
       "Tartarus", "Tartarus", "Tar",
       NULL,
-      DARKGREY, DARKGREY,
+      false, false, DARKGREY, DARKGREY,
       mons_tartarus_rare, mons_tartarus_level, NULL,
       0, 'Y'
     },
@@ -152,7 +163,7 @@ Branch branches[] = {
       NUM_FEATURES, NUM_FEATURES,
       NULL, NULL, NULL,
       NULL,
-      BLACK, BLACK,
+      false, false, BLACK, BLACK,
       NULL, NULL, NULL,
       0, 'R'
     },
@@ -161,7 +172,7 @@ Branch branches[] = {
       NUM_FEATURES, NUM_FEATURES,
       NULL, NULL, NULL,
       NULL,
-      BLACK, BLACK,
+      false, false, BLACK, BLACK,
       NULL, NULL, NULL,
       0, '0'
     },
@@ -170,14 +181,15 @@ Branch branches[] = {
       DNGN_ENTER_ZOT, DNGN_RETURN_FROM_ZOT,
       "Zot", "the Realm of Zot", "Zot",
       NULL,
-      BLACK, BLACK, mons_hallzot_rare, mons_hallzot_level, NULL,
+      false, true, BLACK, BLACK,
+      mons_hallzot_rare, mons_hallzot_level, NULL,
       1, 'Z' },
 
     { BRANCH_CAVERNS, BRANCH_MAIN_DUNGEON, -1, -1,
       NUM_FEATURES, NUM_FEATURES,
       NULL, NULL, NULL,
       NULL,
-      BLACK, BLACK,
+      false, false, BLACK, BLACK,
       NULL, NULL, NULL,
       0, 0
     }
diff --git a/crawl-ref/source/branch.h b/crawl-ref/source/branch.h
index 1cb0cfc997..e98e288e55 100644
--- a/crawl-ref/source/branch.h
+++ b/crawl-ref/source/branch.h
@@ -25,6 +25,8 @@ struct Branch
     const char* longname;       // "The Pits of Slime"
     const char* abbrevname;     // "Slime"
     const char* entry_message;
+    bool has_shops;
+    bool has_uniques;
     char floor_colour;          // Zot needs special handling
     char rock_colour;
     int (*mons_rarity_function)(int);
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index e45c2b5686..c1ac43d334 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -86,10 +86,10 @@ static bool make_box(int room_x1, int room_y1, int room_x2, int room_y2,
     unsigned char floor=0, unsigned char wall=0, unsigned char avoid=0);
 static void replace_area(int sx, int sy, int ex, int ey, unsigned char replace,
     unsigned char feature);
-static int builder_by_type(int level_number, char level_type);
-static int builder_by_branch(int level_number);
-static int builder_normal(int level_number, char level_type, spec_room &s);
-static int builder_basic(int level_number);
+static builder_rc_type builder_by_type(int level_number, char level_type);
+static builder_rc_type builder_by_branch(int level_number);
+static builder_rc_type builder_normal(int level_number, char level_type, spec_room &s);
+static builder_rc_type builder_basic(int level_number);
 static void builder_extras(int level_number, int level_type);
 static void builder_items(int level_number, char level_type, int items_wanted);
 static void builder_monsters(int level_number, char level_type, int mon_wanted);
@@ -387,121 +387,59 @@ static void reset_level()
 static void build_layout_skeleton(int level_number, int level_type,
                                   spec_room &sr)
 {
-    int skip_build = builder_by_type(level_number, level_type);
-    if (skip_build < 0)
+    builder_rc_type skip_build = builder_by_type(level_number, level_type);
+
+    if (skip_build == BUILD_QUIT)       // quit immediately
         return;
 
-    if (skip_build == 0)
+    if (skip_build == BUILD_CONTINUE)
     {
         skip_build = builder_by_branch(level_number);
 
-        if (skip_build < 0)
+        if (skip_build == BUILD_QUIT)
             return;
     }
 
-    if (skip_build == 0)
+    if (skip_build == BUILD_CONTINUE)
     {
         // do 'normal' building.  Well, except for the swamp.
         if (!player_in_branch( BRANCH_SWAMP ))
             skip_build = builder_normal(level_number, level_type, sr);
 
-        if (skip_build == 0)
+        if (skip_build == BUILD_CONTINUE)
         {
             skip_build = builder_basic(level_number);
-            if (skip_build == 0)
+            if (skip_build == BUILD_CONTINUE)
                 builder_extras(level_number, level_type);
         }
     }
 }
 
-static void build_dungeon_level(int level_number, int level_type)
+static int num_mons_wanted(int level_type)
 {
-    spec_room sr;
+    if (level_type == LEVEL_ABYSS ||
+        player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))
+        return 0;
 
-    reset_level();
-    build_layout_skeleton(level_number, level_type, sr);
+    int mon_wanted = roll_dice( 3, 10 );
 
-    if (you.level_type == LEVEL_LABYRINTH)
-        return;
+    if (player_in_hell())
+        mon_wanted += roll_dice( 3, 8 );
+    else if (player_in_branch( BRANCH_HALL_OF_BLADES ))
+        mon_wanted += roll_dice( 6, 8 );
     
-    // Try to place minivaults that really badly want to be placed. Still
-    // no guarantees, seeing this is a minivault.
-    place_special_minivaults(level_number, level_type);
-
-    // hook up the special room (if there is one, and it hasn't
-    // been hooked up already in roguey_level()
-    if (sr.created && !sr.hooked_up)
-        specr_2(sr);
-
-    // now place items, monster, gates, etc.
-    // stairs must exist by this point. Some items and monsters
-    // already exist.
-
-    // time to make the swamp {dlb}:
-    if (player_in_branch( BRANCH_SWAMP ))
-        prepare_swamp();
+    if (mon_wanted > 60)
+        mon_wanted = 60;
 
-    // figure out how many 'normal' monsters we should place
-    int mon_wanted = 0;
-    if (level_type == LEVEL_ABYSS
-        || player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))
-    {
-        mon_wanted = 0;
-    }
-    else
-    {
-        mon_wanted = roll_dice( 3, 10 );
-
-        if (player_in_hell())
-            mon_wanted += roll_dice( 3, 8 );
-        else if (player_in_branch( BRANCH_HALL_OF_BLADES ))
-            mon_wanted += roll_dice( 6, 8 );
-
-        // unlikely - now only possible in HoB {dlb} 10mar2000
-        if (mon_wanted > 60)
-            mon_wanted = 60;
-    }
-
-    place_branch_entrances( level_number, level_type );
-
-    check_doors();
-
-    if (!player_in_branch( BRANCH_DIS ) && !player_in_branch( BRANCH_VAULTS ))
-        hide_doors();
-
-    if (!player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))
-        place_traps(level_number);
-
-    int items_wanted = 3 + roll_dice( 3, 11 );
-
-    if (level_number > 5 && one_chance_in(500 - 5 * level_number))
-        items_wanted = 10 + random2avg( 90, 2 );  // rich level!
-
-    // change pre-rock (105) to rock, and pre-floor (106) to floor
-    replace_area( 0,0,GXM-1,GYM-1, DNGN_BUILDER_SPECIAL_WALL, DNGN_ROCK_WALL );
-    replace_area( 0,0,GXM-1,GYM-1, DNGN_BUILDER_SPECIAL_FLOOR, DNGN_FLOOR );
-
-    // place items
-    builder_items(level_number, level_type, items_wanted);
-
-    // place monsters
-    builder_monsters(level_number, level_type, mon_wanted);
-
-    // place shops, if appropriate
-    if (player_in_branch( BRANCH_MAIN_DUNGEON )
-         || player_in_branch( BRANCH_ORCISH_MINES )
-         || player_in_branch( BRANCH_ELVEN_HALLS )
-         || player_in_branch( BRANCH_LAIR )
-         || player_in_branch( BRANCH_VAULTS )
-         || player_in_branch( BRANCH_SNAKE_PIT )
-         || player_in_branch( BRANCH_SWAMP ))
-    {
-        place_shops(level_number);
-    }
+    return mon_wanted;
+}
 
+static void fixup_walls()
+{
     // If level part of Dis -> all walls metal;
     // If part of vaults -> walls depend on level;
     // If part of crypt -> all walls stone:
+
     if (player_in_branch( BRANCH_DIS )
         || player_in_branch( BRANCH_VAULTS )
         || player_in_branch( BRANCH_CRYPT ))
@@ -530,7 +468,10 @@ static void build_dungeon_level(int level_number, int level_type)
 
         replace_area(0,0,GXM-1,GYM-1,DNGN_ROCK_WALL,vault_wall);
     }
+}
 
+static void fixup_branch_stairs()
+{
     // Top level of branch levels - replaces up stairs
     // with stairs back to dungeon or wherever:
     if ( branches[(int)you.where_are_you].exit_stairs != NUM_FEATURES &&
@@ -555,18 +496,8 @@ static void build_dungeon_level(int level_number, int level_type)
                     grd[x][y] = DNGN_ROCK_STAIRS_UP;
     }
 
-    if (player_in_branch( BRANCH_CRYPT ))
-    {
-        if (one_chance_in(3))
-            mons_place( MONS_CURSE_SKULL, BEH_SLEEP, MHITNOT, false, 0, 0 );
-
-        if (one_chance_in(7))
-            mons_place( MONS_CURSE_SKULL, BEH_SLEEP, MHITNOT, false, 0, 0 );
-    }
-
-    place_altars();
-
     // hall of blades (1 level deal) - no down staircases, thanks!
+    // XXX XXX why the special-casing?
     if (player_in_branch( BRANCH_HALL_OF_BLADES ))
     {
         for (int x = 1; x < GXM; x++)
@@ -581,6 +512,77 @@ static void build_dungeon_level(int level_number, int level_type)
             }
         }
     }
+}
+
+static void build_dungeon_level(int level_number, int level_type)
+{
+    spec_room sr;
+
+    reset_level();
+    build_layout_skeleton(level_number, level_type, sr);
+
+    if (you.level_type == LEVEL_LABYRINTH)
+        return;
+    
+    // Try to place minivaults that really badly want to be placed. Still
+    // no guarantees, seeing this is a minivault.
+    place_special_minivaults(level_number, level_type);
+
+    // hook up the special room (if there is one, and it hasn't
+    // been hooked up already in roguey_level()
+    if (sr.created && !sr.hooked_up)
+        specr_2(sr);
+
+    // now place items, monster, gates, etc.
+    // stairs must exist by this point. Some items and monsters
+    // already exist.
+
+    // time to make the swamp {dlb}:
+    if (player_in_branch( BRANCH_SWAMP ))
+        prepare_swamp();
+
+    place_branch_entrances( level_number, level_type );
+
+    check_doors();
+
+    if (!player_in_branch( BRANCH_DIS ) && !player_in_branch( BRANCH_VAULTS ))
+        hide_doors();
+
+    if (!player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))
+        place_traps(level_number);
+
+    int items_wanted = 3 + roll_dice( 3, 11 );
+
+    if (level_number > 5 && one_chance_in(500 - 5 * level_number))
+        items_wanted = 10 + random2avg( 90, 2 );  // rich level!
+
+    // change pre-rock (105) to rock, and pre-floor (106) to floor
+    replace_area( 0,0,GXM-1,GYM-1, DNGN_BUILDER_SPECIAL_WALL, DNGN_ROCK_WALL );
+    replace_area( 0,0,GXM-1,GYM-1, DNGN_BUILDER_SPECIAL_FLOOR, DNGN_FLOOR );
+
+    // place items
+    builder_items(level_number, level_type, items_wanted);
+
+    // place monsters
+    builder_monsters(level_number, level_type, num_mons_wanted(level_type));
+
+    // place shops, if appropriate
+    if ( branches[(int)you.where_are_you].has_shops )
+        place_shops(level_number);
+
+    fixup_walls();
+    fixup_branch_stairs();
+
+    if (player_in_branch( BRANCH_CRYPT ))
+    {
+        if (one_chance_in(3))
+            mons_place( MONS_CURSE_SKULL, BEH_SLEEP, MHITNOT, false, 0, 0 );
+
+        if (one_chance_in(7))
+            mons_place( MONS_CURSE_SKULL, BEH_SLEEP, MHITNOT, false, 0, 0 );
+    }
+
+    place_altars();
 
     link_items();
 
@@ -3673,22 +3675,15 @@ static void set_weapon_special(int the_weapon, int spwpn)
 
 static void check_doors(void)
 {
-    unsigned char ig;
-    unsigned char solid_count = 0;      // clarifies innermost loop {dlb}
-    int x,y;
-
-    for (x = 1; x < GXM-1; x++)
+    for (int x = 1; x < GXM-1; x++)
     {
-        for (y = 1; y < GYM-1; y++)
+        for (int y = 1; y < GYM-1; y++)
         {
-            ig = grd[x][y];
-
-            if (ig != DNGN_CLOSED_DOOR)
+            if (grd[x][y] != DNGN_CLOSED_DOOR)
                 continue;
 
-            solid_count = 0;
+            int solid_count = 0;
 
-            // first half of each conditional represents bounds checking {dlb}:
             if (grid_is_solid( grd[x - 1][y] ))
                 solid_count++;
 
@@ -3878,23 +3873,23 @@ static bool make_box(int room_x1, int room_y1, int room_x2, int room_y2,
 // take care of labyrinth, abyss, pandemonium
 // returns 1 if we should skip further generation,
 // -1 if we should immediately quit, and 0 otherwise.
-static int builder_by_type(int level_number, char level_type)
+static builder_rc_type builder_by_type(int level_number, char level_type)
 {
     if (level_type == LEVEL_LABYRINTH)
     {
         labyrinth_level(level_number);
-        return -1;
+        return BUILD_QUIT;
     }
 
     if (level_type == LEVEL_ABYSS)
     {
         generate_abyss();
-        return 1;
+        return BUILD_SKIP;
     }
 
     if (level_type == LEVEL_PANDEMONIUM)
     {
-        char which_demon = -1;
+        int which_demon = -1;
         // Could do spotty_level, but that doesn't always put all paired
         // stairs reachable from each other which isn't a problem in normal
         // dungeon but could be in Pandemonium
@@ -3923,14 +3918,12 @@ static int builder_by_type(int level_number, char level_type)
             you.unique_creatures[MONS_MNOLEG + which_demon] = true;
 
             const int vault = 
-                random_map_for_tag(
-                    pandemon_level_names[(int) which_demon],
-                    false);
+                random_map_for_tag(pandemon_level_names[which_demon], false);
 
             ASSERT(vault != -1);
             if (vault == -1)
                 end(1, false, "Failed to find Pandemonium level %s!\n",
-                    pandemon_level_names[(int) which_demon]);
+                    pandemon_level_names[which_demon]);
 
             build_vaults(level_number, vault);
         }
@@ -3945,11 +3938,11 @@ static int builder_by_type(int level_number, char level_type)
             build_minivaults(level_number, vault);
         }
 
-        return 1;
+        return BUILD_SKIP;
     }
 
     // must be normal dungeon
-    return 0;
+    return BUILD_CONTINUE;
 }
 
 static int random_portal_vault(const std::string &tag)
@@ -3995,42 +3988,42 @@ static int random_map_for_dlevel(int level_number, bool wantmini = false)
 
 // returns 1 if we should skip further generation,
 // -1 if we should immediately quit, and 0 otherwise.
-static int builder_by_branch(int level_number)
+static builder_rc_type builder_by_branch(int level_number)
 {
     const int vault = random_map_for_dlevel(level_number);
 
     if (vault != -1)
     {
         build_vaults(level_number, vault);
-        return 1;
+        return BUILD_SKIP;
     }
 
     switch (you.where_are_you)
     {
     case BRANCH_HIVE:
         spotty_level(false, 100 + random2(500), false);
-        return 1;
+        return BUILD_SKIP;
 
     case BRANCH_SLIME_PITS:
         spotty_level(false, 100 + random2(500), false);
-        return 1;
+        return BUILD_SKIP;
 
     case BRANCH_ORCISH_MINES:
         spotty_level(false, 100 + random2(500), false);
-        return 1;
+        return BUILD_SKIP;
 
     case BRANCH_LAIR:
         if (!one_chance_in(3))
         {
             spotty_level(false, 100 + random2(500), false);
-            return 1;
+            return BUILD_SKIP;
         }
         break;
 
     default:
         break;
     }
-    return 0;
+    return BUILD_CONTINUE;
 }
 
 static void place_special_minivaults(int level_number, int level_type)
@@ -4064,8 +4057,8 @@ static void place_special_minivaults(int level_number, int level_type)
 // returns 1 if we should dispense with city building,
 // 0 otherwise.  Also sets special_room if one is generated
 // so that we can link it up later.
-
-static int builder_normal(int level_number, char level_type, spec_room &sr)
+static builder_rc_type builder_normal(int level_number, char level_type,
+                                      spec_room &sr)
 {
     UNUSED( level_type );
 
@@ -4083,13 +4076,13 @@ static int builder_normal(int level_number, char level_type, spec_room &sr)
     if (vault != -1)
     {
         build_vaults(level_number, vault);
-        return 1;
+        return BUILD_SKIP;
     }
 
     if (player_in_branch( BRANCH_DIS ))
     {
         city_level(level_number);
-        return 1;
+        return BUILD_SKIP;
     }
 
     if (player_in_branch( BRANCH_VAULTS ))
@@ -4098,7 +4091,7 @@ static int builder_normal(int level_number, char level_type, spec_room &sr)
             city_level(level_number);
         else
             plan_main(level_number, 4);
-        return 1;
+        return BUILD_SKIP;
     }
 
     if (level_number > 7 && level_number < 23)
@@ -4106,13 +4099,13 @@ static int builder_normal(int level_number, char level_type, spec_room &sr)
         if (one_chance_in(16))
         {
             spotty_level(false, 0, coinflip());
-            return 1;
+            return BUILD_SKIP;
         }
 
         if (one_chance_in(16))
         {
             bigger_room();
-            return 1;
+            return BUILD_SKIP;
         }
     }
 
@@ -4127,7 +4120,7 @@ static int builder_normal(int level_number, char level_type, spec_room &sr)
                 build_minivaults(level_number, mvault);
         }
 
-        return 1;
+        return BUILD_SKIP;
     }
 
     if (one_chance_in(3))
@@ -4146,7 +4139,7 @@ static int builder_normal(int level_number, char level_type, spec_room &sr)
             if (mvault != -1)
             {
                 build_minivaults(level_number, mvault);
-                return 1;
+                return BUILD_SKIP;
             }
         }
     }
@@ -4167,11 +4160,11 @@ static int builder_normal(int level_number, char level_type, spec_room &sr)
     if (!sr.created && level_number > 5 && !done_city && one_chance_in(5))
         special_room(level_number, sr);
 
-    return 0;
+    return BUILD_CONTINUE;
 }
 
 // returns 1 if we should skip extras(), otherwise 0
-static int builder_basic(int level_number)
+static builder_rc_type builder_basic(int level_number)
 {
     int temp_rand;
     int doorlevel = random2(11);
@@ -4265,7 +4258,7 @@ static int builder_basic(int level_number)
         }
     }
 
-    return 0;
+    return BUILD_CONTINUE;
 }
 
 static void builder_extras( int level_number, int level_type )
@@ -4323,7 +4316,6 @@ static void builder_extras( int level_number, int level_type )
             build_lake( river_type );
     }
 
-
     if (level_number > 8 && one_chance_in(16))
         build_river( river_type );
     else if (level_number > 8 && one_chance_in(12))
@@ -4784,20 +4776,13 @@ static void builder_monsters(int level_number, char level_type, int mon_wanted)
     }
 
     // Unique beasties:
-    int which_unique;
-
     if (level_number > 0
         && you.level_type == LEVEL_DUNGEON  // avoid generating on temp levels
-        && !player_in_hell()
-        && !player_in_branch( BRANCH_ORCISH_MINES )
-        && !player_in_branch( BRANCH_HIVE )
-        && !player_in_branch( BRANCH_LAIR )
-        && !player_in_branch( BRANCH_SLIME_PITS )
-        && !player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))
+        && branches[(int)you.where_are_you].has_uniques)
     {
         while(one_chance_in(3))
         {
-            which_unique = -1;   //     30 in total
+            int which_unique = -1;   //     30 in total
 
             while(which_unique < 0 || you.unique_creatures[which_unique])
             {
@@ -4813,7 +4798,7 @@ static void builder_monsters(int level_number, char level_type, int mon_wanted)
 
             // usually, we'll have quit after a few tries. Make sure we don't
             // create unique[-1] by accident.
-            if (which_unique < 0)
+            if (which_unique == -1)
                 break;
 
             // note: unique_creatures 40 + used by unique demons
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index af55054702..149ae24fd4 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -481,6 +481,13 @@ enum branch_type                // you.where_are_you
     NUM_BRANCHES
 };
 
+enum builder_rc_type
+{
+    BUILD_QUIT = -1,                 // all done, don't continue
+    BUILD_SKIP = 1,                 // skip further generation
+    BUILD_CONTINUE = 0              // continue generation
+};
+
 enum burden_state_type                 // you.burden_state
 {
     BS_UNENCUMBERED,                   //    0