From 6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 14 Apr 2013 17:06:02 +0300 Subject: another fixes from cpplint. --- src/particleemitter.h | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'src/particleemitter.h') diff --git a/src/particleemitter.h b/src/particleemitter.h index b879ffa13..83cd7af82 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -72,7 +72,7 @@ class ParticleEmitter final * Sets the target of the particles that are created */ void setTarget(Particle *const target) - { mParticleTarget = target; }; + { mParticleTarget = target; } /** * Changes the size of the emitter so that the effect fills a @@ -123,23 +123,30 @@ class ParticleEmitter final ParticleEmitterProp mParticleFadeOut; ParticleEmitterProp mParticleFadeIn; - Map *mMap; /**< Map the particles are spawned on */ + // Map the particles are spawned on + Map *mMap; - ParticleEmitterProp mOutput; /**< Number of particles spawned - per update */ - ParticleEmitterProp mOutputPause; /**< Pause in frames between - two spawns */ + // Number of particles spawned per update + ParticleEmitterProp mOutput; + + // Pause in frames between two spawns + ParticleEmitterProp mOutputPause; int mOutputPauseLeft; /* * Graphical representation of the particles */ - Image *mParticleImage; /**< Particle image, if used */ - Animation mParticleAnimation; /**< Filename of particle - animation file */ - Animation mParticleRotation; /**< Filename of particle rotation file */ - ParticleEmitterProp mParticleAlpha; /**< Opacity of the - graphical representation of the particles */ + // Particle image, if used + Image *mParticleImage; + + // Filename of particle animation file + Animation mParticleAnimation; + + // Filename of particle rotation file + Animation mParticleRotation; + + // Opacity of the graphical representation of the particles + ParticleEmitterProp mParticleAlpha; /* * Death effect of the particles @@ -147,7 +154,7 @@ class ParticleEmitter final std::string mDeathEffect; signed char mDeathEffectConditions; - /** List of emitters the spawned particles are equipped with */ + // List of emitters the spawned particles are equipped with std::list mParticleChildEmitters; std::vector mTempSets; -- cgit v1.2.3-60-g2f50