summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dungeon.h
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/dungeon.h
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/dungeon.h')
-rw-r--r--crawl-ref/source/dungeon.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/dungeon.h b/crawl-ref/source/dungeon.h
index 125041258d..c730d26ec5 100644
--- a/crawl-ref/source/dungeon.h
+++ b/crawl-ref/source/dungeon.h
@@ -288,9 +288,9 @@ bool flood_find<fgrd, bound_check>::path_flood(
}
}
- const dungeon_feature_type grid = fgrid(dc);
+ const dungeon_feature_type feat = fgrid(dc);
- if (grid == NUM_FEATURES)
+ if (feat == NUM_FEATURES)
{
if (want_exit)
{
@@ -301,16 +301,16 @@ bool flood_find<fgrd, bound_check>::path_flood(
return (false);
}
- if (needed_features[ grid ])
+ if (needed_features[ feat ])
{
unexplored_place = dc;
unexplored_dist = traveled_distance;
return (true);
}
- if (!is_traversable(grid)
- && grid != DNGN_SECRET_DOOR
- && !grid_is_trap(grid))
+ if (!is_traversable(feat)
+ && feat != DNGN_SECRET_DOOR
+ && !feat_is_trap(feat))
{
return (false);
}