summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-tornado.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2013-02-21 16:19:49 -0500
committerNeil Moore <neil@s-z.org>2013-02-21 17:49:21 -0500
commit1be813ee8cc8db99c4b62640beada2bdb59cc46d (patch)
tree768b83f1e60169bbdc7909bdacb68940036d61f0 /crawl-ref/source/spl-tornado.cc
parenta9265854a996268dcc3d0128fd9c65c9005e3769 (diff)
downloadcrawl-ref-1be813ee8cc8db99c4b62640beada2bdb59cc46d.tar.gz
crawl-ref-1be813ee8cc8db99c4b62640beada2bdb59cc46d.zip
Remove a number of dead assignments (SLi).
In the case in spl-data.cc, the comment made it sound like the line was supposed to set min_dist instead of the dead variable dist. However, we could only reach this code path if min_dist == dist, so that assignment wouldn't do anything anyway. I left a few reported dead assignments that I think make the code more maintainable.
Diffstat (limited to 'crawl-ref/source/spl-tornado.cc')
-rw-r--r--crawl-ref/source/spl-tornado.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/crawl-ref/source/spl-tornado.cc b/crawl-ref/source/spl-tornado.cc
index c7d1e4445b..4bdb935062 100644
--- a/crawl-ref/source/spl-tornado.cc
+++ b/crawl-ref/source/spl-tornado.cc
@@ -301,10 +301,7 @@ void tornado_damage(actor *caster, int dur)
if (actor* victim = actor_at(*dam_i))
{
if (victim->submerged())
- {
- leda = true; // and with fish, too
continue;
- }
if (victim->is_player() && monster_at(*dam_i))
{
// A far-fetched case: you're using Fedhas' passthrough
@@ -312,14 +309,10 @@ void tornado_damage(actor *caster, int dur)
// no free spots, and a monster tornado rotates you.
// Plants don't get uprooted, so the logic would be
// really complex. Let's not go there.
- leda = true;
continue;
}
if (victim->is_player() && you.form == TRAN_TREE)
- {
- leda = true;
continue;
- }
leda = victim->liquefied_ground()
|| victim->is_monster()