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/luadgn.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/luadgn.cc')
| -rw-r--r-- | crawl-ref/source/luadgn.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/luadgn.cc b/crawl-ref/source/luadgn.cc index 7820c3593f..8bd36c5fdc 100644 --- a/crawl-ref/source/luadgn.cc +++ b/crawl-ref/source/luadgn.cc @@ -1075,8 +1075,8 @@ const char *dngn_feature_names[] = "open_door", "", "", "trap_mechanical", "trap_magical", "trap_natural", "undiscovered_trap", "", "enter_shop", "enter_labyrinth", "stone_stairs_down_i", "stone_stairs_down_ii", - "stone_stairs_down_iii", "rock_stairs_down", "stone_stairs_up_i", - "stone_stairs_up_ii", "stone_stairs_up_iii", "rock_stairs_up", "", + "stone_stairs_down_iii", "escape_hatch_down", "stone_stairs_up_i", + "stone_stairs_up_ii", "stone_stairs_up_iii", "escape_hatch_up", "", "", "enter_dis", "enter_gehenna", "enter_cocytus", "enter_tartarus", "enter_abyss", "exit_abyss", "stone_arch", "enter_pandemonium", "exit_pandemonium", "transit_pandemonium", @@ -1366,7 +1366,7 @@ static int dgn_fixup_stairs(lua_State *ls) for (int x = 0; x < GXM; ++x) { const dungeon_feature_type feat = grd[x][y]; - if (grid_is_stone_stair(feat) || grid_is_rock_stair(feat)) + if (grid_is_stone_stair(feat) || grid_is_escape_hatch(feat)) { dungeon_feature_type new_feat = DNGN_UNSEEN; |