summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.h
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2013-06-25 14:03:58 -0400
committerNeil Moore <neil@s-z.org>2013-06-25 14:05:57 -0400
commit9f0588190d3095191a7aaff61e2d8ca0d0b945f0 (patch)
tree07a4ce665a1c189b5bd59e2405421c9102c9abb5 /crawl-ref/source/beam.h
parent5898b77cf4dfcbad0aa503aac6dbc28e06dc9fc8 (diff)
downloadcrawl-ref-9f0588190d3095191a7aaff61e2d8ca0d0b945f0.tar.gz
crawl-ref-9f0588190d3095191a7aaff61e2d8ca0d0b945f0.zip
Don't crash on reflected needles.
We were checking the weapon of the beam's agent(), but reflected beams returned the reflector, not the original agent. Add a new parameter to bolt::agent() to handle this.
Diffstat (limited to 'crawl-ref/source/beam.h')
-rw-r--r--crawl-ref/source/beam.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.h b/crawl-ref/source/beam.h
index dc44bec21b..4730ce4073 100644
--- a/crawl-ref/source/beam.h
+++ b/crawl-ref/source/beam.h
@@ -181,7 +181,7 @@ public:
kill_category whose_kill() const;
- actor* agent() const;
+ actor* agent(bool ignore_reflections = false) const;
void fire();