diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2008-08-24 18:58:39 +0000 |
|---|---|---|
| committer | Philipp Sehmisch <tmw@crushnet.org> | 2008-08-24 18:58:39 +0000 |
| commit | 2cdb3c70b062014d9e96ff778c3bdee8796ecf5e (patch) | |
| tree | f1815dffc68e93668b1fea5c65e45932de7349cc | |
| parent | 73d4611c036b57549fa33aabfadb8ec528ad2d45 (diff) | |
| download | mana-2cdb3c70b062014d9e96ff778c3bdee8796ecf5e.tar.gz mana-2cdb3c70b062014d9e96ff778c3bdee8796ecf5e.tar.bz2 mana-2cdb3c70b062014d9e96ff778c3bdee8796ecf5e.tar.xz mana-2cdb3c70b062014d9e96ff778c3bdee8796ecf5e.zip | |
fix for an error in the last commit
| -rw-r--r-- | src/particleemitter.cpp | 2 | ||||
| -rw-r--r-- | src/particleemitter.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index 1696a134..b2cc16c7 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -140,7 +140,7 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map * else if (name == "output-pause") { mOutputPause = readMinMax(propertyNode, 0); - mOutputPauseLeft = mOutputSkip.value(); + mOutputPauseLeft = mOutputPause.value(); } else if (name == "acceleration") { diff --git a/src/particleemitter.h b/src/particleemitter.h index c1365163..54341018 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -119,8 +119,8 @@ class ParticleEmitter Map *mMap; /**< Map the particles are spawned on */ MinMax<int> mOutput; /**< Number of particles spawned per update */ - MinMax<int> mOutputSkip; /**< Pause in frames between two spawns */ - int mOutputSkipPause; + MinMax<int> mOutputPause; /**< Pause in frames between two spawns */ + int mOutputPauseLeft; /* * Graphical representation of the particle |