From 86bae0c1a3a28bc81c0fb66576e63c0a965c292c Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sat, 29 Mar 2008 00:54:15 +0000 Subject: 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 --- crawl-ref/source/enum.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/enum.h') diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 12905cb746..e54cbbb2ca 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -875,6 +875,7 @@ enum dungeon_feature_type DNGN_LAVA = 61, // 61 DNGN_DEEP_WATER, // 62 + DNGN_SHALLOW_WATER = 65, // 65 DNGN_WATER_STUCK, @@ -884,6 +885,7 @@ enum dungeon_feature_type DNGN_EXIT_HELL, // 70 DNGN_ENTER_HELL, // 71 DNGN_OPEN_DOOR, // 72 + DNGN_TRAP_MECHANICAL = 75, // 75 DNGN_TRAP_MAGICAL, DNGN_TRAP_NATURAL, @@ -895,13 +897,13 @@ enum dungeon_feature_type DNGN_STONE_STAIRS_DOWN_I, DNGN_STONE_STAIRS_DOWN_II, DNGN_STONE_STAIRS_DOWN_III, - DNGN_ROCK_STAIRS_DOWN, // 85 - now escape hatch (Stonesoup 0.3) + DNGN_ESCAPE_HATCH_DOWN, // 85 - was: rock stairs (Stonesoup 0.3) // corresponding up stairs (same order as above) DNGN_STONE_STAIRS_UP_I, DNGN_STONE_STAIRS_UP_II, DNGN_STONE_STAIRS_UP_III, - DNGN_ROCK_STAIRS_UP, // 89 - now escape hatch (Stonesoup 0.3) + DNGN_ESCAPE_HATCH_UP, // 89 - was: rock stairs (Stonesoup 0.3) // Various gates DNGN_ENTER_DIS = 92, // 92 -- cgit v1.2.3-54-g00ecf