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

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.

Location:

code/branches/core7/src/orxonox

Files:

• ShipPartManager.cc (modified) (2 diffs)
• items/ShipPart.cc (modified) (4 diffs)
• worldentities/pawns/ModularSpaceShip.cc (modified) (3 diffs)

code/branches/core7/src/orxonox/ShipPartManager.cc

@@ -46 +46 @@
     ShipPartManager::~ShipPartManager()
     {
-        // Be sure to delete all the pawns
+        // Be sure to delete all the ship parts
         for (ObjectList<ShipPart>::iterator it = ObjectList<ShipPart>::begin(); it != ObjectList<ShipPart>::end(); )
-            (it++)->death();
+            (it++)->destroy();
     }
 
@@ -56 +56 @@
         {
             if (!it->isAlive())
-                (it++)->death();
+                (it++)->destroy();
             else
                 ++it;

code/branches/core7/src/orxonox/items/ShipPart.cc

@@ -50 +50 @@
 
     ShipPart::ShipPart(Context* context)
-        : Item(context)
+        : Item(context), parent_(NULL)
     {
         RegisterObject(ShipPart);
-        this->setAlive(true);
-        this->setEventExecution(true);
+        this->alive_ = true;
+        this->eventExecution_ = true;
         this->healthMem_ = 100;
     }
@@ -60 +60 @@
     ShipPart::~ShipPart()
     {
-
+        if (this->parent_)
+        {
+            // Remove this ShipPart from the parent.
+            this->parent_->removeShipPart(this);
+        }
     }
 
@@ -100 +104 @@
             }
         }
-
-        // Remove this ShipPart from the parent.
-        this->parent_->removeShipPart(this);
-        delete this;
     }
 
@@ -240 +240 @@
         }
         if (this->health_ < 0)
-            this->alive_ = false;
-            //this->death();
+            this->death();
 
         // (Ugly) Chatoutput of health, until a GUI for modularspaceships-shipparts is implemented.

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;
             }