diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-26 03:59:17 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-26 03:59:17 +0000 |
| commit | c9d3683f746b4b4d77747803e4bec9ca1e29f405 (patch) | |
| tree | 736589105055ff2e7137234f8359ee0d71400b8f /crawl-ref/source/dungeon.cc | |
| parent | 5ef44f94de7c4fd42e7af4bae86eda1d34402860 (diff) | |
| download | crawl-ref-c9d3683f746b4b4d77747803e4bec9ca1e29f405.tar.gz crawl-ref-c9d3683f746b4b4d77747803e4bec9ca1e29f405.zip | |
Minor dungeon fixes. Encompass maps were erroneously being vetoed. Octagon rooms no longer have a hideous discontinuity on their lower right corner. Octagon rooms are also no longer always smeared.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6687 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dungeon.cc')
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 14 |
1 files changed, 7 insertions, 7 deletions
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); |