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

1 files changed, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index 8fd267120c..430fb30a1a 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -2148,8 +2148,8 @@ bool tutorial_feat_interesting(dungeon_feature_type feat)
        case DNGN_STONE_STAIRS_UP_I:
        case DNGN_STONE_STAIRS_UP_II:
        case DNGN_STONE_STAIRS_UP_III:
-       case DNGN_ROCK_STAIRS_DOWN:
-       case DNGN_ROCK_STAIRS_UP:
+       case DNGN_ESCAPE_HATCH_DOWN:
+       case DNGN_ESCAPE_HATCH_UP:
             return true;
        default:
             return false;
@@ -2220,8 +2220,8 @@ void tutorial_describe_feature(dungeon_feature_type feat)
             Options.tutorial_events[TUT_SEEN_STAIRS] = 0;
             break;
 
-       case DNGN_ROCK_STAIRS_DOWN:
-       case DNGN_ROCK_STAIRS_UP:
+       case DNGN_ESCAPE_HATCH_DOWN:
+       case DNGN_ESCAPE_HATCH_UP:
             ostr << "Escape hatches can be used to quickly leave a level with "
                     "<w><<</w> and <w>></w>, respectively. Note that "
                     "you will usually be unable to return right away.";