[1753369] Fixed sealed rooms being generated in the Vaults.

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

1 files changed, 5 insertions, 3 deletions

diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index a3c39b3a6f..7d5e24b3a6 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -5473,7 +5473,8 @@ static void box_room(int bx1, int bx2, int by1, int by2,
     replace_area(bx1,by1+1,bx1,by2-1,DNGN_FLOOR,wall_type);
     replace_area(bx2,by1+1,bx2,by2-1,DNGN_FLOOR,wall_type);
 
-    // sometimes we have to place doors, or else we shut in other buildings' doors
+    // sometimes we have to place doors, or else we shut in other
+    // buildings' doors
     doors_placed = box_room_doors(bx1, bx2, by1, by2, 0);
 
     temp_rand = random2(100);
@@ -5481,7 +5482,7 @@ static void box_room(int bx1, int bx2, int by1, int by2,
                 ((temp_rand > 22) ? 1 : 3);
 
     // small rooms don't have as many doors
-    if ((bx2-bx1)*(by2-by1) < 36)
+    if ((bx2-bx1)*(by2-by1) < 36 && new_doors > 1)
         new_doors--;
 
     new_doors -= doors_placed;
@@ -5545,7 +5546,8 @@ static void city_level(int level_number)
 
                     // treasure area.. neat.
                     if (one_chance_in(3))
-                        treasure_area(level_number, x1 + 3, x2 - 3, y1 + 3, y2 - 3);
+                        treasure_area(level_number, x1 + 3, x2 - 3,
+                                      y1 + 3, y2 - 3);
                 }
             }
         }