From dcc94e4df24a1111124d87532aaa263f55edf58d Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 17 Oct 2009 07:51:25 +0200 Subject: Naming consistency. Mostly rename functions from terrain.h that accept features of typ dgn_feature_type from grid_is_* to feat_is_*. --- crawl-ref/source/ray.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/ray.cc') 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) { -- cgit v1.2.3-54-g00ecf