Changeset 10414 for code/branches/core7/src/orxonox/worldentities

Timestamp:

May 3, 2015, 11:47:50 AM (10 years ago)

Author:

landauf

Message:

destroy all remaining ship parts if ModularSpaceShip is destroyed.
separate ship part death effects from object deletion. ShipPart.death() creates effects, ShipPartManager destroys the instance.

File:

• code/branches/core7/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) (3 diffs)

code/branches/core7/src/orxonox/worldentities/pawns/ModularSpaceShip.cc

@@ -69 +69 @@
         if (this->isInitialized())
         {
-
+            while (!this->partList_.empty())
+                this->partList_[0]->destroy();
         }
     }
@@ -177 +178 @@
             if (it->second->getName() == name)
             {
-                it->second->setAlive(false);
+                it->second->death();
                 return;
             }
@@ -196 +197 @@
             if (it->second->getName() == name)
             {
-                it->second->setAlive(false);
+                it->second->death();
                 return;
             }