summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ray.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-10-17 07:51:25 +0200
committerRobert Vollmert <rvollmert@gmx.net>2009-10-17 07:51:25 +0200
commitdcc94e4df24a1111124d87532aaa263f55edf58d (patch)
treedf911326b4c245006eb94761f76e1af4093bd2fc /crawl-ref/source/ray.cc
parent4b9dbd4fc204e70ef70f57ec0096981787844f82 (diff)
downloadcrawl-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/ray.cc')
-rw-r--r--crawl-ref/source/ray.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/ray.cc b/crawl-ref/source/ray.cc
index 4beb6bed92..6d3db368d6 100644
--- a/crawl-ref/source/ray.cc
+++ b/crawl-ref/source/ray.cc
@@ -87,10 +87,10 @@ void ray_def::advance_and_bounce()
const double oldaccx = accx, oldaccy = accy;
adv_type rc = advance(false);
int newx = x(), newy = y();
- ASSERT(grid_is_solid(grd[newx][newy]));
+ ASSERT(feat_is_solid(grd[newx][newy]));
- const bool blocked_x = grid_is_solid(grd[oldx][newy]);
- const bool blocked_y = grid_is_solid(grd[newx][oldy]);
+ const bool blocked_x = feat_is_solid(grd[oldx][newy]);
+ const bool blocked_y = feat_is_solid(grd[newx][oldy]);
if (double_is_zero(slope) || slope > 100.0)
{