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, 3 deletions

diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index d84005a239..d2d2d30dbf 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -1112,10 +1112,11 @@ static trap_type random_trap_default(int level_number, const level_id &place)
 
     // Note we're boosting arrow trap numbers by moving it
     // down the list, and making spear and axe traps rarer.
-    if (type == TRAP_DART?
-        random2(1 + level_number) > 2
-        : one_chance_in(7))
+    if (type == TRAP_DART ? random2(1 + level_number) > 2
+                          : one_chance_in(7))
+    {
         type = TRAP_ARROW;
+    }
         
     if ((type == TRAP_DART || type == TRAP_ARROW) && one_chance_in(15))
         type = TRAP_NET;