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/maps.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/maps.cc')
-rw-r--r-- | crawl-ref/source/maps.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc index eb28cb485c..38960f8bb9 100644 --- a/crawl-ref/source/maps.cc +++ b/crawl-ref/source/maps.cc @@ -184,17 +184,17 @@ static bool _may_overwrite_feature(const dungeon_feature_type grid, return (water_ok); // Handle all other non-LOS blocking grids here. - if (!grid_is_opaque(grid) + if (!feat_is_opaque(grid) && grid != DNGN_FLOOR && grid != DNGN_SHALLOW_WATER && grid != DNGN_OPEN_DOOR && grid != DNGN_SECRET_DOOR - && !grid_is_closed_door(grid)) + && !feat_is_closed_door(grid)) { return (false); } - if (grid_is_wall(grid)) + if (feat_is_wall(grid)) return (wall_ok); // Otherwise, feel free to clobber this feature. |