summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--src/particleemitter.cpp3
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 027dbb97..559467e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@
* src/net/loginhandler.cpp: Removed the usually incorrect "for 5
minutes" clause from the message displayed to banned users.
+ * src/particleemitter.cpp: Added output-pause to copy constructor.
2008-08-27 Bjørn Lindeijer <bjorn@lindeijer.nl>
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;