diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-17 07:51:25 +0200 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-17 07:51:25 +0200 |
| commit | dcc94e4df24a1111124d87532aaa263f55edf58d (patch) | |
| tree | df911326b4c245006eb94761f76e1af4093bd2fc /crawl-ref/source/abyss.cc | |
| parent | 4b9dbd4fc204e70ef70f57ec0096981787844f82 (diff) | |
| download | crawl-ref-dcc94e4df24a1111124d87532aaa263f55edf58d.tar.gz crawl-ref-dcc94e4df24a1111124d87532aaa263f55edf58d.zip | |
Naming consistency.
Mostly rename functions from terrain.h that accept features of typ
dgn_feature_type from grid_is_* to feat_is_*.
Diffstat (limited to 'crawl-ref/source/abyss.cc')
| -rw-r--r-- | crawl-ref/source/abyss.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index f8c331ad00..13bc428e2c 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -688,7 +688,7 @@ static bool _spawn_corrupted_servant_near(const coord_def &pos) const coord_def p( pos.x + random2avg(4, 3) + random2(3), pos.y + random2avg(4, 3) + random2(3) ); if (!in_bounds(p) || actor_at(p) - || !grid_compatible(DNGN_FLOOR, grd(p))) + || !feat_compatible(DNGN_FLOOR, grd(p))) { continue; } @@ -754,7 +754,7 @@ static bool _is_grid_corruptible(const coord_def &c) const dungeon_feature_type feat = grd(c); // Stairs and portals cannot be corrupted. - if (grid_stair_direction(feat) != CMD_NO_CMD) + if (feat_stair_direction(feat) != CMD_NO_CMD) return (false); switch (feat) @@ -802,7 +802,7 @@ static bool _is_crowded_square(const coord_def &c) static bool _is_sealed_square(const coord_def &c) { for (adjacent_iterator ai(c); ai; ++ai) - if ( !grid_is_opaque(grd(*ai)) ) + if ( !feat_is_opaque(grd(*ai)) ) return (false); return (true); @@ -813,7 +813,7 @@ static void _corrupt_square(const crawl_environment &oenv, const coord_def &c) // To prevent the destruction of, say, branch entries. bool preserve_feat = true; dungeon_feature_type feat = DNGN_UNSEEN; - if (grid_altar_god(grd(c)) != GOD_NO_GOD) + if (feat_altar_god(grd(c)) != GOD_NO_GOD) { // altars may be safely overwritten, ha! preserve_feat = false; @@ -823,7 +823,7 @@ static void _corrupt_square(const crawl_environment &oenv, const coord_def &c) else feat = oenv.grid(c); - if (grid_is_trap(feat, true) + if (feat_is_trap(feat, true) || feat == DNGN_SECRET_DOOR || feat == DNGN_UNSEEN) { return; |