diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-04 12:52:55 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-04 12:52:55 +0000 |
| commit | ce144b644df6884660606906b2e0bd2d002a9c6c (patch) | |
| tree | 0c38eac8f5a02835a7a71ce827b99e33656d7e19 /crawl-ref/source/files.cc | |
| parent | 1f97cbc369b32cf86dda02a148b29d8696e2906c (diff) | |
| download | crawl-ref-ce144b644df6884660606906b2e0bd2d002a9c6c.tar.gz crawl-ref-ce144b644df6884660606906b2e0bd2d002a9c6c.zip | |
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
Diffstat (limited to 'crawl-ref/source/files.cc')
| -rw-r--r-- | crawl-ref/source/files.cc | 14 |
1 files changed, 7 insertions, 7 deletions
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) |