summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2008-05-28 16:51:26 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2008-05-28 16:51:26 +0000
commitb4bf0aba860093121dff7f469d4cd19a578a9c09 (patch)
tree095bfc9ab2f8011099cf64411f192fa38d1ab535
parent7f9c54c79c1bd7e7e2cd7b5f7dd0373d831bc8a8 (diff)
downloadmana-b4bf0aba860093121dff7f469d4cd19a578a9c09.tar.gz
mana-b4bf0aba860093121dff7f469d4cd19a578a9c09.tar.bz2
mana-b4bf0aba860093121dff7f469d4cd19a578a9c09.tar.xz
mana-b4bf0aba860093121dff7f469d4cd19a578a9c09.zip
Changed the way particle emitter skip is handled to make linear and circular emitters work with particleEmitterSkip enabled.
-rw-r--r--ChangeLog5
-rw-r--r--src/particle.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 50f34460..44f04ba1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-28 Philipp Sehmisch <tmw@crushnet.org>
+
+ * src/particle.cpp: Changed the way particle emitter skip is handled to
+ make linear and circular emitters work with particleEmitterSkip enabled.
+
2008-05-28 Dennis Friis <peavey@placid.dk>
* src/being.cpp: Change order of direction to up/down/right/left in
diff --git a/src/particle.cpp b/src/particle.cpp
index f58a26f1..355b7069 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -170,7 +170,7 @@ Particle::update()
}
// Update child emitters
- if (mLifetimePast%Particle::emitterSkip == 0)
+ if ((mLifetimePast-1)%Particle::emitterSkip == 0)
{
for ( EmitterIterator e = mChildEmitters.begin();
e != mChildEmitters.end();