diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2008-08-28 22:44:43 +0000 |
|---|---|---|
| committer | Philipp Sehmisch <tmw@crushnet.org> | 2008-08-28 22:44:43 +0000 |
| commit | 41bb6d9efe7884b2605d42584c5fda3327c87156 (patch) | |
| tree | a28867505c2bee11a8d3103082ce1c0737492138 | |
| parent | 7334c8dd3a7125126e63cd8a483ec93f03bc690d (diff) | |
| download | mana-41bb6d9efe7884b2605d42584c5fda3327c87156.tar.gz mana-41bb6d9efe7884b2605d42584c5fda3327c87156.tar.bz2 mana-41bb6d9efe7884b2605d42584c5fda3327c87156.tar.xz mana-41bb6d9efe7884b2605d42584c5fda3327c87156.zip | |
Added output-pause to copy constructor of particle emitters.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/particleemitter.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
@@ -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; |