diff options
| author | Ira Rice <irarice@gmail.com> | 2008-09-25 00:15:44 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-09-25 00:15:44 +0000 |
| commit | 489a429bea6739dfa25503b9329bd9e33bffb856 (patch) | |
| tree | 8112f6fd988fdc0610329b6bc14ee3f9d5801092 /src/particleemitter.h | |
| parent | 2dc8eadff1e67bb70b1772ecc19c9e1e2e40a5b4 (diff) | |
| download | mana-489a429bea6739dfa25503b9329bd9e33bffb856.tar.gz mana-489a429bea6739dfa25503b9329bd9e33bffb856.tar.bz2 mana-489a429bea6739dfa25503b9329bd9e33bffb856.tar.xz mana-489a429bea6739dfa25503b9329bd9e33bffb856.zip | |
Merged the Tametomo branch into trunk.
Diffstat (limited to 'src/particleemitter.h')
| -rw-r--r-- | src/particleemitter.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/particleemitter.h b/src/particleemitter.h index 481d4b44..5cf3fd46 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: particleemitter.h 4362 2008-06-24 12:29:33Z crush_tmw $ + * $Id$ */ #ifndef _PARTICLEEMITTER_H @@ -97,7 +97,7 @@ class ParticleEmitter * Vector changing of particles: */ MinMax<float> mParticleGravity; - MinMax<int> mParticleRandomnes; + MinMax<int> mParticleRandomness; MinMax<float> mParticleBounce; bool mParticleFollow; @@ -119,6 +119,8 @@ class ParticleEmitter Map *mMap; /**< Map the particles are spawned on */ MinMax<int> mOutput; /**< Number of particles spawned per update */ + MinMax<int> mOutputPause; /**< Pause in frames between two spawns */ + int mOutputPauseLeft; /* * Graphical representation of the particle |