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

Timestamp:

May 3, 2015, 11:47:50 AM (9 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/items/ShipPart.cc (modified) (4 diffs)

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.