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/terrain.h | 50 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'crawl-ref/source/terrain.h') diff --git a/crawl-ref/source/terrain.h b/crawl-ref/source/terrain.h index 05dd845f42..35ff6603c9 100644 --- a/crawl-ref/source/terrain.h +++ b/crawl-ref/source/terrain.h @@ -19,32 +19,32 @@ bool fall_into_a_pool( const coord_def& entry, bool allow_shift, unsigned char terrain ); -bool grid_is_wall(dungeon_feature_type grid); -bool grid_is_opaque(dungeon_feature_type grid); -bool grid_is_solid(dungeon_feature_type grid); -bool grid_is_solid(int x, int y); -bool grid_is_solid(const coord_def &c); -bool grid_is_closed_door(dungeon_feature_type grid); -bool grid_is_secret_door(dungeon_feature_type grid); -bool grid_is_rock(dungeon_feature_type grid); -bool grid_is_permarock(dungeon_feature_type grid); -bool grid_is_stone_stair(dungeon_feature_type grid); -bool grid_is_staircase(dungeon_feature_type grid); -bool grid_is_escape_hatch(dungeon_feature_type grid); -bool grid_is_trap(dungeon_feature_type grid, bool undiscovered_too = false); -command_type grid_stair_direction(dungeon_feature_type grid); -bool grid_sealable_portal(dungeon_feature_type grid); -bool grid_is_portal(dungeon_feature_type grid); - -std::string grid_preposition(dungeon_feature_type grid, bool active = false, +bool feat_is_wall(dungeon_feature_type feat); +bool feat_is_opaque(dungeon_feature_type feat); +bool feat_is_solid(dungeon_feature_type feat); +bool cell_is_solid(int x, int y); +bool cell_is_solid(const coord_def &c); +bool feat_is_closed_door(dungeon_feature_type feat); +bool feat_is_secret_door(dungeon_feature_type feat); +bool feat_is_rock(dungeon_feature_type feat); +bool feat_is_permarock(dungeon_feature_type feat); +bool feat_is_stone_stair(dungeon_feature_type feat); +bool feat_is_staircase(dungeon_feature_type feat); +bool feat_is_escape_hatch(dungeon_feature_type feat); +bool feat_is_trap(dungeon_feature_type feat, bool undiscovered_too = false); +command_type feat_stair_direction(dungeon_feature_type feat); +bool feat_sealable_portal(dungeon_feature_type feat); +bool feat_is_portal(dungeon_feature_type feat); + +std::string feat_preposition(dungeon_feature_type feat, bool active = false, const actor* who = NULL); -std::string stair_climb_verb(dungeon_feature_type grid); +std::string stair_climb_verb(dungeon_feature_type feat); -bool grid_is_water(dungeon_feature_type grid); -bool grid_is_watery(dungeon_feature_type grid); -god_type grid_altar_god(dungeon_feature_type grid); +bool feat_is_water(dungeon_feature_type feat); +bool feat_is_watery(dungeon_feature_type feat); +god_type feat_altar_god(dungeon_feature_type feat); dungeon_feature_type altar_for_god(god_type god); -bool grid_is_branch_stairs(dungeon_feature_type grid); +bool feat_is_branch_stairs(dungeon_feature_type feat); void find_connected_identical(coord_def d, dungeon_feature_type ft, std::set& out); void find_connected_range(coord_def d, dungeon_feature_type ft_min, @@ -54,9 +54,9 @@ void get_door_description(int door_size, const char** adjective, const char** no dungeon_feature_type grid_secret_door_appearance(const coord_def &where); dungeon_feature_type grid_appearance(const coord_def &gc); unsigned int show_appearance(const coord_def &ep); -bool grid_destroys_items(dungeon_feature_type grid); +bool feat_destroys_items(dungeon_feature_type feat); -const char *grid_item_destruction_message( dungeon_feature_type grid ); +const char *feat_item_destruction_message( dungeon_feature_type feat ); // Terrain changed under 'pos', perform necessary effects. void dungeon_terrain_changed(const coord_def &pos, -- cgit v1.2.3-54-g00ecf