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/tilepick.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/tilepick.cc') diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 6a150a4b05..23fbe166f4 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -118,7 +118,7 @@ static int _bow_offset(const monsters *mon) int tileidx_monster_base(const monsters *mon, bool detected) { - bool in_water = grid_is_water(grd(mon->pos())); + bool in_water = feat_is_water(grd(mon->pos())); int type = mon->type; @@ -2364,7 +2364,7 @@ int tileidx_feature(int object, int gx, int gy) { const dungeon_feature_type appear = grid_secret_door_appearance(coord_def(gx, gy)); - ASSERT(!grid_is_secret_door(appear)); + ASSERT(!feat_is_secret_door(appear)); return tileidx_feature((int) appear, gx, gy); } case DNGN_CLEAR_ROCK_WALL: @@ -4243,7 +4243,7 @@ void tile_init_flavour(const coord_def &gc) env.tile_flv(gc).wall = env.tile_default.wall + wall_rnd; } - if (grd(gc) == DNGN_OPEN_DOOR || grid_is_closed_door(grd(gc))) + if (grd(gc) == DNGN_OPEN_DOOR || feat_is_closed_door(grd(gc))) { // Check for horizontal gates. @@ -4271,7 +4271,7 @@ void tile_init_flavour(const coord_def &gc) else env.tile_flv(gc).special = 0; } - else if (grid_is_secret_door(grd(gc))) + else if (feat_is_secret_door(grd(gc))) env.tile_flv(gc).special = 0; else if (!env.tile_flv(gc).special) env.tile_flv(gc).special = random2(256); -- cgit v1.2.3-54-g00ecf