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/abyss.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/abyss.cc') diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index 35da6aa06d..286f415a98 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -728,12 +728,10 @@ static void corrupt_square(const crawl_environment &oenv, const coord_def &c) else feat = oenv.grid(c); - if (grid_is_trap(feat) || feat == DNGN_UNDISCOVERED_TRAP - || feat == DNGN_SECRET_DOOR || feat == DNGN_UNSEEN) + if (is_trap_square(feat) || feat == DNGN_SECRET_DOOR || feat == DNGN_UNSEEN) return; - if (is_traversable(grd(c)) && !is_traversable(feat) - && is_crowded_square(c)) + if (is_traversable(grd(c)) && !is_traversable(feat) && is_crowded_square(c)) return; if (!is_traversable(grd(c)) && is_traversable(feat) && is_sealed_square(c)) -- cgit v1.2.3-54-g00ecf