diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-26 04:00:12 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-26 04:00:12 +0000 |
| commit | 7475f09d1df35f6d884cd33a502e339b0e92b944 (patch) | |
| tree | 027c7a12631c6caa3fbd6cabe95a292c8231918f | |
| parent | 1ffdf8216b21c698b43aad450628e10be0956da7 (diff) | |
| download | crawl-ref-7475f09d1df35f6d884cd33a502e339b0e92b944.tar.gz crawl-ref-7475f09d1df35f6d884cd33a502e339b0e92b944.zip | |
Applying r6687 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6688 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/dat/layout.des | 2 | ||||
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/dat/layout.des b/crawl-ref/source/dat/layout.des index 59e5d5d561..6888c3af19 100644 --- a/crawl-ref/source/dat/layout.des +++ b/crawl-ref/source/dat/layout.des @@ -149,7 +149,7 @@ TAGS: layout allow_dup dgn.fill_area(0, 0, gxm - 1, gym - 1, "rock_wall") dgn.octa_room(10, 10, gxm - 10, gym - 10, oblique, "floor") - if crawl.coinflip() or true then + if crawl.coinflip() then local iterations = 100 + crawl.random2(200) dgn.smear_feature(iterations, false, wall, 0, 0, gxm - 1, gym - 1) end diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index b93a86bc60..d24e9e2e34 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -4343,7 +4343,7 @@ static bool _build_vaults(int level_number, int force_vault, int rune_subst, place.map.map.apply_overlays(place.pos); _register_place(place); - if (target_connections.empty()) + if (target_connections.empty() && gluggy != MAP_ENCOMPASS) _pick_float_exits(place, target_connections); if (make_no_exits) @@ -6243,11 +6243,11 @@ bool octa_room(spec_room &sr, int oblique_max, if (grd[x][y] == DNGN_BUILDER_SPECIAL_WALL) return (false); - if (oblique > 0) - oblique--; - if (x > sr.x2 - oblique_max) oblique += 2; + + if (oblique > 0) + oblique--; } oblique = oblique_max; @@ -6267,11 +6267,11 @@ bool octa_room(spec_room &sr, int oblique_max, grd[x][y] = DNGN_FLOOR; // ick } - if (oblique > 0) - oblique--; - if (x > sr.x2 - oblique_max) oblique += 2; + + if (oblique > 0) + oblique--; } return (true); |