Changeset 10420 for code/branches/core7/src/orxonox/worldentities/pawns/Pawn.cc

Timestamp:

May 3, 2015, 3:02:05 PM (9 years ago)

Author:

landauf

Message:

use destroyLater() in Pawn and ShipPart. PawnManager and ShipPartManager are not needed anymore.

File:

• code/branches/core7/src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

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

@@ -326 +326 @@
         if (this->getGametype() && this->getGametype()->allowPawnDeath(this, this->lastHitOriginator_))
         {
-            // Set bAlive_ to false and wait for PawnManager to do the destruction
+            // Set bAlive_ to false and wait for destroyLater() to do the destruction
             this->bAlive_ = false;
+            this->destroyLater();
 
             this->setDestroyWhenPlayerLeft(false);