summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-15 02:47:31 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-15 02:47:31 +0000
commit7f265db06afe995d6640f828bee71bf23cc07193 (patch)
treef73dddf4fca41b479b0f48ddbc428437167ff8b4 /crawl-ref/source/beam.cc
parent04dd7f785c274d0a8e9730806fd2c890792df275 (diff)
downloadcrawl-ref-7f265db06afe995d6640f828bee71bf23cc07193.tar.gz
crawl-ref-7f265db06afe995d6640f828bee71bf23cc07193.zip
Implement tracer += operator logic.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8454 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index ec592b478c..bf48e44b0a 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -84,6 +84,13 @@ void tracer_info::reset()
const tracer_info& tracer_info::operator+=(const tracer_info &other)
{
+ count += other.count;
+ power += other.power;
+ hurt += other.hurt;
+ helped += other.helped;
+
+ dont_stop = dont_stop || other.dont_stop;
+
return (*this);
}