Changeset 11070 for code/branches/cpp11_v3/src/orxonox/items/MultiStateEngine.cc

Timestamp:

Jan 17, 2016, 8:40:36 PM (9 years ago)

Author:

landauf

Message:

return collections directly instead of begin and end iterators.
this also fixes an issue in MultiStateEngine where two for-loops used begin() instead of end() in the loop condition.

File:

• code/branches/cpp11_v3/src/orxonox/items/MultiStateEngine.cc (modified) (2 diffs)

code/branches/cpp11_v3/src/orxonox/items/MultiStateEngine.cc

@@ -86 +86 @@
                 // We have no ship, so the effects are not attached and won't be destroyed automatically
                 for (EffectContainer* container : this->effectContainers_)
-                    for (std::vector<WorldEntity*>::const_iterator it = container->getEffectsBegin(); it != container->getEffectsBegin(); ++it)
-                        (*it)->destroy();
+                    for (WorldEntity* effect : container->getEffects())
+                        effect->destroy();
                 if (this->defEngineSndNormal_)
                     this->defEngineSndNormal_->destroy();
@@ -199 +199 @@
 
         for (EffectContainer* container : this->effectContainers_)
-            for (std::vector<WorldEntity*>::const_iterator it = container->getEffectsBegin(); it != container->getEffectsEnd(); ++it)
-                this->getShip()->attach(*it);
-    }
-
-    void MultiStateEngine::addEffectContainer(EffectContainer* effect)
-    {
-        if (effect == nullptr)
+            for (WorldEntity* effect : container->getEffects())
+                this->getShip()->attach(effect);
+    }
+
+    void MultiStateEngine::addEffectContainer(EffectContainer* container)
+    {
+        if (container == nullptr)
             return;
-        effect->setLuaState(this->lua_, 'f' + multi_cast<std::string>(this->effectContainers_.size()));
-        this->effectContainers_.push_back(effect);
+        container->setLuaState(this->lua_, 'f' + multi_cast<std::string>(this->effectContainers_.size()));
+        this->effectContainers_.push_back(container);
         if (this->getShip())
         {
-            for (std::vector<WorldEntity*>::const_iterator it = effect->getEffectsBegin(); it != effect->getEffectsBegin(); ++it)
-                this->getShip()->attach(*it);
+            for (WorldEntity* effect : container->getEffects())
+                this->getShip()->attach(effect);
         }
     }