From ce144b644df6884660606906b2e0bd2d002a9c6c Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Thu, 4 Oct 2007 12:52:55 +0000 Subject: Another cleanup of dungeon features. Adding general markers for first branch/last branch and first altar/last altar that should hopefully make adding new ones easier. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2324 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/files.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'crawl-ref/source/files.cc') diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index 951cd6794a..d3848d7c3f 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -701,19 +701,19 @@ static void place_player_on_stair(branch_type old_branch, // look for coresponding down stair stair_taken += (DNGN_STONE_STAIRS_DOWN_I - DNGN_STONE_STAIRS_UP_I); } - else if (stair_taken >= DNGN_RETURN_FROM_ORCISH_MINES + else if (stair_taken >= DNGN_RETURN_FROM_FIRST_BRANCH && stair_taken < 150) // 20 slots reserved { // find entry point to subdungeon when leaving - stair_taken += (DNGN_ENTER_ORCISH_MINES - - DNGN_RETURN_FROM_ORCISH_MINES); + stair_taken += (DNGN_ENTER_FIRST_BRANCH + - DNGN_RETURN_FROM_FIRST_BRANCH); } - else if (stair_taken >= DNGN_ENTER_ORCISH_MINES - && stair_taken < DNGN_RETURN_FROM_ORCISH_MINES) + else if (stair_taken >= DNGN_ENTER_FIRST_BRANCH + && stair_taken < DNGN_RETURN_FROM_FIRST_BRANCH) { // find exit staircase from subdungeon when entering - stair_taken += (DNGN_RETURN_FROM_ORCISH_MINES - - DNGN_ENTER_ORCISH_MINES); + stair_taken += (DNGN_RETURN_FROM_FIRST_BRANCH + - DNGN_ENTER_FIRST_BRANCH); } else if (stair_taken >= DNGN_ENTER_DIS && stair_taken <= DNGN_TRANSIT_PANDEMONIUM) -- cgit v1.2.3-54-g00ecf