summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2008-08-28 22:44:43 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2008-08-28 22:44:43 +0000
commit41bb6d9efe7884b2605d42584c5fda3327c87156 (patch)
treea28867505c2bee11a8d3103082ce1c0737492138 /src
parent7334c8dd3a7125126e63cd8a483ec93f03bc690d (diff)
downloadmana-client-41bb6d9efe7884b2605d42584c5fda3327c87156.tar.gz
mana-client-41bb6d9efe7884b2605d42584c5fda3327c87156.tar.bz2
mana-client-41bb6d9efe7884b2605d42584c5fda3327c87156.tar.xz
mana-client-41bb6d9efe7884b2605d42584c5fda3327c87156.zip
Added output-pause to copy constructor of particle emitters.
Diffstat (limited to 'src')
-rw-r--r--src/particleemitter.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 545936f0..3e0a3d75 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -281,10 +281,13 @@ ParticleEmitter & ParticleEmitter::operator=(const ParticleEmitter &o)
mParticleAlpha = o.mParticleAlpha;
mMap = o.mMap;
mOutput = o.mOutput;
+ mOutputPause = o.mOutputPause;
mParticleImage = o.mParticleImage;
mParticleAnimation = o.mParticleAnimation;
mParticleChildEmitters = o.mParticleChildEmitters;
+ mOutputPauseLeft = 0;
+
if (mParticleImage) mParticleImage->incRef();
return *this;