diff options
author | Neil Moore <neil@s-z.org> | 2013-10-31 23:53:20 -0400 |
---|---|---|
committer | Neil Moore <neil@s-z.org> | 2013-11-01 00:02:55 -0400 |
commit | 334afa25fe4c81f59c075f9c3ea9fe08c00fb2ab (patch) | |
tree | 8db4eb78ec031906c4dd8ede40cd3d706a5a982f /crawl-ref/source/spl-clouds.cc | |
parent | b7236c5810b553c903aee423f3e165ec3c2487e1 (diff) | |
download | crawl-ref-334afa25fe4c81f59c075f9c3ea9fe08c00fb2ab.tar.gz crawl-ref-334afa25fe4c81f59c075f9c3ea9fe08c00fb2ab.zip |
Use cell_is_solid where appropriate.
Diffstat (limited to 'crawl-ref/source/spl-clouds.cc')
-rw-r--r-- | crawl-ref/source/spl-clouds.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/spl-clouds.cc b/crawl-ref/source/spl-clouds.cc index 95a2ef598f..d6c9f31207 100644 --- a/crawl-ref/source/spl-clouds.cc +++ b/crawl-ref/source/spl-clouds.cc @@ -290,7 +290,7 @@ void manage_fire_shield(int delay) // Place fire clouds all around you for (adjacent_iterator ai(you.pos()); ai; ++ai) - if (!feat_is_solid(grd(*ai)) && env.cgrid(*ai) == EMPTY_CLOUD) + if (!cell_is_solid(*ai) && env.cgrid(*ai) == EMPTY_CLOUD) place_cloud(CLOUD_FIRE, *ai, 1 + random2(6), &you); } @@ -357,7 +357,7 @@ int holy_flames(monster* caster, actor* defender) { if (!in_bounds(*ai) || env.cgrid(*ai) != EMPTY_CLOUD - || feat_is_solid(grd(*ai)) + || cell_is_solid(*ai) || is_sanctuary(*ai) || monster_at(*ai)) { @@ -383,7 +383,7 @@ struct dist2_sorter static bool _safe_cloud_spot(const monster* mon, coord_def p) { - if (feat_is_solid(grd(p)) || env.cgrid(p) != EMPTY_CLOUD) + if (cell_is_solid(p) || env.cgrid(p) != EMPTY_CLOUD) return false; if (actor_at(p) && mons_aligned(mon, actor_at(p))) |