diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-29 00:54:15 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-29 00:54:15 +0000 |
| commit | 86bae0c1a3a28bc81c0fb66576e63c0a965c292c (patch) | |
| tree | 360f93338d3a9978c03842451c494765f221d471 /crawl-ref/source/files.cc | |
| parent | 4df1ff7d51ee4c57b53af69e9f5e7db3ee72ab1a (diff) | |
| download | crawl-ref-86bae0c1a3a28bc81c0fb66576e63c0a965c292c.tar.gz crawl-ref-86bae0c1a3a28bc81c0fb66576e63c0a965c292c.zip | |
Prevent shafts from being created in corridors, at least until
around dungeon level 7.
Rename ROCK_STAIRS to ESCAPE_HATCH, as well as the corresponding
function, since I think that the escape hatches are such a cool
concept that we won't be going back, and the current coding name
is a bit confusing.
Clean up dungeon.cc. I'll probably have to add stuff into our
new conventions file as I've been making up a lot of new rules
in trying to make the code more readable. (Rules concerning
nested brackets, and function indentation, etc.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3927 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/files.cc')
| -rw-r--r-- | crawl-ref/source/files.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index 6b606f8923..d6de3741da 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -741,13 +741,13 @@ static void place_player_on_stair(branch_type old_branch, stair_taken = DNGN_STONE_STAIRS_UP_I; } else if (stair_taken >= DNGN_STONE_STAIRS_DOWN_I - && stair_taken <= DNGN_ROCK_STAIRS_DOWN) + && stair_taken <= DNGN_ESCAPE_HATCH_DOWN) { // look for coresponding up stair stair_taken += (DNGN_STONE_STAIRS_UP_I - DNGN_STONE_STAIRS_DOWN_I); } else if (stair_taken >= DNGN_STONE_STAIRS_UP_I - && stair_taken <= DNGN_ROCK_STAIRS_UP) + && stair_taken <= DNGN_ESCAPE_HATCH_UP) { // look for coresponding down stair stair_taken += (DNGN_STONE_STAIRS_DOWN_I - DNGN_STONE_STAIRS_UP_I); @@ -778,7 +778,7 @@ static void place_player_on_stair(branch_type old_branch, } else if (stair_taken == DNGN_EXIT_PORTAL_VAULT) { - stair_taken = DNGN_ROCK_STAIRS_DOWN; + stair_taken = DNGN_ESCAPE_HATCH_DOWN; } else if (stair_taken == DNGN_ENTER_LABYRINTH) { |