diff options
author | Philipp Sehmisch <crush@themanaworld.org> | 2008-12-14 03:43:37 +0100 |
---|---|---|
committer | Philipp Sehmisch <crush@themanaworld.org> | 2008-12-14 03:43:37 +0100 |
commit | 864e33db117a28256a89d03e750b38df044bee6e (patch) | |
tree | 709e71008e734ce18400721e9779da3f71f70cce /src/particlecontainer.cpp | |
parent | 59f441730d8dbd7574b2fe4c9a430be256449cab (diff) | |
download | mana-864e33db117a28256a89d03e750b38df044bee6e.tar.gz mana-864e33db117a28256a89d03e750b38df044bee6e.tar.bz2 mana-864e33db117a28256a89d03e750b38df044bee6e.tar.xz mana-864e33db117a28256a89d03e750b38df044bee6e.zip |
Fixed follow-parent of nested and being-following particle emitters
Diffstat (limited to 'src/particlecontainer.cpp')
-rw-r--r-- | src/particlecontainer.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp index bf15f1b5..27ba5ede 100644 --- a/src/particlecontainer.cpp +++ b/src/particlecontainer.cpp @@ -45,10 +45,10 @@ void ParticleContainer::clear() } -void ParticleContainer::setPositions(float x, float y) +void ParticleContainer::moveTo(float x, float y) { if (mNext) - mNext->setPositions(x, y); + mNext->moveTo(x, y); } // -- particle list ---------------------------------------- @@ -91,14 +91,14 @@ void ParticleList::clearLocally() mElements.clear(); } -void ParticleList::setPositions(float x, float y) +void ParticleList::moveTo(float x, float y) { - ParticleContainer::setPositions(x, y); + ParticleContainer::moveTo(x, y); for (std::list<Particle *>::iterator it = mElements.begin(); it != mElements.end();) { - (*it)->setPosition(x, y); + (*it)->moveTo(x, y); if ((*it)->isExtinct()) { (*it)->kill(); @@ -156,15 +156,15 @@ void ParticleVector::clearLocally() delLocally(i); } -void ParticleVector::setPositions(float x, float y) +void ParticleVector::moveTo(float x, float y) { - ParticleContainer::setPositions(x, y); + ParticleContainer::moveTo(x, y); for (std::vector<Particle *>::iterator it = mIndexedElements.begin(); it != mIndexedElements.end(); it++) { if (*it) { - (*it)->setPosition(x, y); + (*it)->moveTo(x, y); if ((*it)->isExtinct()) { |