summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/stairs.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-12-21 00:28:13 +0100
committerAdam Borowski <kilobyte@angband.pl>2013-12-21 00:28:13 +0100
commitf4c5cb98bb572c1dae2e44f05c5c3c4cae54777c (patch)
treed9ca516e674aa4e30d8689de1e2b8b311f15bd13 /crawl-ref/source/stairs.cc
parentd5abc4ae04a57c8412b158be7cad694971d47508 (diff)
downloadcrawl-ref-f4c5cb98bb572c1dae2e44f05c5c3c4cae54777c.tar.gz
crawl-ref-f4c5cb98bb572c1dae2e44f05c5c3c4cae54777c.zip
Ignore brentry when returning from a ziggurat.
The code checked this before the level stack, thus if you returned from Pan, a trovel or (in transferred saves) D, you got placed in Depths instead. For extra fun, try this in a pre-Depths save! :รพ We could just check the stack first, but the current code allows for a regular subbranch of the Abyss, etc.
Diffstat (limited to 'crawl-ref/source/stairs.cc')
-rw-r--r--crawl-ref/source/stairs.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/stairs.cc b/crawl-ref/source/stairs.cc
index 39609e09ca..aa9569ed4c 100644
--- a/crawl-ref/source/stairs.cc
+++ b/crawl-ref/source/stairs.cc
@@ -499,7 +499,8 @@ level_id stair_destination(dungeon_feature_type feat, const string &dst,
feat = DNGN_EXIT_LABYRINTH;
#endif
if (branches[you.where_are_you].exit_stairs == feat
- && parent_branch(you.where_are_you) < NUM_BRANCHES)
+ && parent_branch(you.where_are_you) < NUM_BRANCHES
+ && feat != DNGN_EXIT_ZIGGURAT)
{
level_id lev = brentry[you.where_are_you];
if (!lev.is_valid())