Fixed follow-parent of nested and being-following particle emitters

1 files changed, 8 insertions, 12 deletions

diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp
index 12ef5733..fbfb1505 100644
--- a/src/particlecontainer.cpp
+++ b/src/particlecontainer.cpp
@@ -44,12 +44,10 @@ ParticleContainer::clear()
         mNext->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,15 +89,14 @@ 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,16 +153,15 @@ 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())
             {