summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells4.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/spells4.cc')
-rw-r--r--crawl-ref/source/spells4.cc19
1 files changed, 10 insertions, 9 deletions
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc
index 3acf2fe0b4..1809fbc1a8 100644
--- a/crawl-ref/source/spells4.cc
+++ b/crawl-ref/source/spells4.cc
@@ -1419,18 +1419,19 @@ bool cast_evaporate(int pow, bolt& beem, int potion)
}
// Fire tracer.
- beem.source_x = you.x_pos;
- beem.source_y = you.y_pos;
- beem.can_see_invis = player_see_invis();
- beem.smart_monster = true;
- beem.attitude = ATT_FRIENDLY;
- beem.fr_count = 0;
- beem.is_tracer = true;
+ beem.source_x = you.x_pos;
+ beem.source_y = you.y_pos;
+ beem.can_see_invis = player_see_invis();
+ beem.smart_monster = true;
+ beem.attitude = ATT_FRIENDLY;
+ beem.fr_count = 0;
+ beem.beam_cancelled = false;
+ beem.is_tracer = true;
fire_beam(beem);
- if (beem.fr_count > 0)
+ if (beem.beam_cancelled)
{
- // We don't want to fire through friendlies.
+ // We don't want to fire through friendlies or at ourselves.
canned_msg(MSG_OK);
return (false);
}