diff options
| -rw-r--r-- | src/particleemitter.cpp | 6 | ||||
| -rw-r--r-- | src/particleemitter.h | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index a90853cdf..924f2094d 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -45,12 +45,12 @@ ParticleEmitter::ParticleEmitter(const XmlNodePtr emitterNode, Particle *const target, Map *const map, const int rotation, const std::string& dyePalettes) : - mParticleFollow(false), mParticleTarget(target), mMap(map), - mOutputPauseLeft(0), mParticleImage(nullptr), - mDeathEffectConditions(0) + mOutputPauseLeft(0), + mDeathEffectConditions(0), + mParticleFollow(false) { // Initializing default values mParticlePosX.set(0.0f); diff --git a/src/particleemitter.h b/src/particleemitter.h index e2f6358d3..28b894254 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -108,7 +108,6 @@ class ParticleEmitter final ParticleEmitterProp<float> mParticleGravity; ParticleEmitterProp<int> mParticleRandomness; ParticleEmitterProp<float> mParticleBounce; - bool mParticleFollow; /* * Properties of targeting particles: @@ -133,7 +132,6 @@ class ParticleEmitter final // Pause in frames between two spawns ParticleEmitterProp<int> mOutputPause; - int mOutputPauseLeft; /* * Graphical representation of the particles @@ -154,11 +152,16 @@ class ParticleEmitter final * Death effect of the particles */ std::string mDeathEffect; - signed char mDeathEffectConditions; // List of emitters the spawned particles are equipped with std::list<ParticleEmitter> mParticleChildEmitters; std::vector<ImageSet*> mTempSets; + + int mOutputPauseLeft; + + signed char mDeathEffectConditions; + + bool mParticleFollow; }; #endif // PARTICLEEMITTER_H |