diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-03 14:36:59 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-03 14:36:59 +0000 |
| commit | 6ab4b3ada4036c926be475796796f48c9c5da949 (patch) | |
| tree | 1c333e55d3cb264fee4d45455b7df6be665b72b4 /crawl-ref/source/dungeon.cc | |
| parent | 8d58d4f59227550653a8312b257d0fb5113c0d45 (diff) | |
| download | crawl-ref-6ab4b3ada4036c926be475796796f48c9c5da949.tar.gz crawl-ref-6ab4b3ada4036c926be475796796f48c9c5da949.zip | |
Fix &L being unable to place encompass vaults (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8171 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dungeon.cc')
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 0b22bfc034..00f025fa9a 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -2887,6 +2887,11 @@ static void _place_extra_vaults() && can_create_vault) { const map_def *vault = random_map_in_depth(level_id::current()); + + // Encompass vaults can't be used as secondaries. + if (!vault || vault->orient == MAP_ENCOMPASS) + break; + if (vault && _build_secondary_vault(you.your_level, vault, -1)) { const map_def &map(*vault); @@ -4099,11 +4104,6 @@ static bool _build_secondary_vault(int level_number, const map_def *vault, int rune_subst, bool clobber, bool no_exits, const coord_def &where) { - // Don't waste time trying to place encompass vaults as - // secondaries. - if (vault->orient == MAP_ENCOMPASS) - return (false); - if (_build_vaults(level_number, vault, rune_subst, true, !clobber, no_exits, where)) { |