diff options
| author | Mikko Vepsalainen <mtvepsal@gmail.com> | 2014-07-03 00:09:22 +0300 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-07-10 22:36:26 -0400 |
| commit | cd11dfcb321c788e456a3f7af785051328db2daa (patch) | |
| tree | 2556c5a10f384ffcd31747f82068e39cc137360c | |
| parent | ee241d86bdbbfc211a063d7be0b8b114c53e18e4 (diff) | |
| download | crawl-ref-cd11dfcb321c788e456a3f7af785051328db2daa.tar.gz crawl-ref-cd11dfcb321c788e456a3f7af785051328db2daa.zip | |
Preserve Abyssal stairs when placing exit vaults.
| -rw-r--r-- | crawl-ref/source/abyss.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/dat/des/branches/abyss.des | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index 10e64a61c0..8ccf74f218 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -193,6 +193,7 @@ static void _abyss_fixup_vault(const vault_placement *vp) const dungeon_feature_type feat(grd(p)); if (feat_is_stair(feat) && feat != DNGN_EXIT_ABYSS + && feat != DNGN_ABYSSAL_STAIR #if TAG_MAJOR_VERSION == 34 && feat != DNGN_ENTER_PORTAL_VAULT #endif @@ -213,7 +214,7 @@ static bool _abyss_place_map(const map_def *mdef) const bool did_place = dgn_safe_place_map(mdef, true, false, INVALID_COORD); if (did_place) - _abyss_fixup_vault(env.level_vaults[env.level_vaults.size() - 1]); + _abyss_fixup_vault(env.level_vaults.back()); return did_place; } diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des index 34bbb57ca6..7bd0658c12 100644 --- a/crawl-ref/source/dat/des/branches/abyss.des +++ b/crawl-ref/source/dat/des/branches/abyss.des @@ -9,8 +9,6 @@ {{ -- Since abyssal stairs don't spawn at the bottom of the Abyss, -- replace a vault's empty guarded floor with a floor item at the bottom. - -- FIXME: regardless of the abyss exit vault's code, sometimes vaults don't place - -- the exit or stair at all? Only with proper level generation, though, not &L. function init_abyss_exit(e, glyph) if you.depth() == dgn.br_depth(you.branch()) then if crawl.random2(10) > 3 then |