diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-17 07:51:25 +0200 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-17 07:51:25 +0200 |
| commit | dcc94e4df24a1111124d87532aaa263f55edf58d (patch) | |
| tree | df911326b4c245006eb94761f76e1af4093bd2fc /crawl-ref/source/fight.cc | |
| parent | 4b9dbd4fc204e70ef70f57ec0096981787844f82 (diff) | |
| download | crawl-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/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 8f8f67f64a..a136971334 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -621,7 +621,7 @@ bool melee_attack::attack() // Defending monster protects itself from attacks using the wall // it's in. - if (defender->atype() == ACT_MONSTER && grid_is_solid(defender->pos()) + if (defender->atype() == ACT_MONSTER && cell_is_solid(defender->pos()) && mons_wall_shielded(defender_as_monster())) { std::string feat_name = raw_feature_description(grd(defender->pos())); @@ -2549,7 +2549,7 @@ static bool _move_stairs(const actor* attacker, const actor* defender) const coord_def orig_pos = attacker->pos(); const dungeon_feature_type stair_feat = grd(orig_pos); - if (grid_stair_direction(stair_feat) == CMD_NO_CMD) + if (feat_stair_direction(stair_feat) == CMD_NO_CMD) return (false); // The player can't use shops to escape, so don't bother. |