summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/traps.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-25 10:58:59 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-25 10:58:59 +0000
commit0cc17e8e77704777c56f86675aab4865a6dcb23c (patch)
treed4b77bed57652f93091e1bf2c63731aadca4d8cd /crawl-ref/source/traps.cc
parent1661545d1b70fd6fdd7bb9261d9cc01a36aa909d (diff)
downloadcrawl-ref-0cc17e8e77704777c56f86675aab4865a6dcb23c.tar.gz
crawl-ref-0cc17e8e77704777c56f86675aab4865a6dcb23c.zip
FR 1951252: Make an exception for shafts leading to Dlvl 27: only shafts
directly above that level (thus, level 26) will drop you into 27, else you'll at most land in Dlvl 26. Still, shafts may be placed on level creation. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4616 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/traps.cc')
-rw-r--r--crawl-ref/source/traps.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index e3aeb77fdb..b54f16ad56 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -1012,7 +1012,9 @@ level_id generic_shaft_dest(level_pos lpos)
// Only shafts on the level immediately above a dangerous branch
// bottom will take you to that dangerous bottom, and shafts can't
// be created during level generation time.
- if (branch.dangerous_bottom_level
+ // Include level 27 of the main dungeon here, but don't restrict
+ // shaft creation (so don't set branch.dangerous_bottom_level).
+ if ((branch.dangerous_bottom_level || lid.branch == BRANCH_MAIN_DUNGEON)
&& lid.depth == branch.depth
&& (branch.depth - curr_depth) > 1)
{