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, 2 insertions, 2 deletions

diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index ca04d07d00..dc8828f14e 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -1894,13 +1894,13 @@ int tileidx_feature(int object, int gx, int gy)
     case DNGN_STONE_STAIRS_DOWN_II: 
     case DNGN_STONE_STAIRS_DOWN_III:
         return TILE_DNGN_STONE_STAIRS_DOWN;
-    case DNGN_ROCK_STAIRS_DOWN:
+    case DNGN_ESCAPE_HATCH_DOWN:
         return TILE_DNGN_ROCK_STAIRS_DOWN;
     case DNGN_STONE_STAIRS_UP_I:
     case DNGN_STONE_STAIRS_UP_II:
     case DNGN_STONE_STAIRS_UP_III:
         return TILE_DNGN_STONE_STAIRS_UP;
-    case DNGN_ROCK_STAIRS_UP:
+    case DNGN_ESCAPE_HATCH_UP:
         return TILE_DNGN_ROCK_STAIRS_UP;
     case DNGN_ENTER_DIS:
         return TILE_DNGN_ENTER_DIS;