Changeset 10420 for code/branches

Timestamp:

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

Author:

landauf

Message:

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

Location:

code/branches/core7/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxonoxPrereqs.h (modified) (1 diff)
• PawnManager.cc (deleted)
• PawnManager.h (deleted)
• ShipPartManager.cc (deleted)
• ShipPartManager.h (deleted)
• collisionshapes/CollisionShape.cc (modified) (1 diff)
• items/ShipPart.cc (modified) (4 diffs)
• items/ShipPart.h (modified) (2 diffs)
• worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/core7/src/orxonox/CMakeLists.txt

@@ -29 +29 @@
   Main.cc
   MoodManager.cc
-  PawnManager.cc
   PlayerManager.cc
-  ShipPartManager.cc
   Radar.cc
 #  Test.cc

code/branches/core7/src/orxonox/OrxonoxPrereqs.h

@@ -73 +73 @@
     class LevelInfoItem;
     class LevelManager;
-    class PawnManager;
     class PlayerManager;
     class Radar;

code/branches/core7/src/orxonox/collisionshapes/CollisionShape.cc

@@ -78 +78 @@
         {
             if (this->getScene() && this->getScene()->isUpdatingPhysics())
-                orxout(internal_error) << "Don't destroy collision shapes while the physics is updated! This will lead to crashes" << endl;
+                orxout(internal_error) << "Don't destroy collision shapes while the physics is updated! This will lead to crashes. Try to use destroyLater() instead" << endl;
 
             if (this->parent_)

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

@@ -53 +53 @@
     {
         RegisterObject(ShipPart);
-        this->alive_ = true;
         this->eventExecution_ = true;
         this->healthMem_ = 100;
@@ -90 +89 @@
     void ShipPart::death()
     {
-        //if (!(this->isAlive()))
-            //return;
-
         this->explode();
-        this->setAlive(false);
 
         if(eventExecution_)
@@ -104 +99 @@
             }
         }
+
+        this->destroyLater();
     }
 
@@ -203 +200 @@
     {
         this->health_ = health;
-    }
-
-    void ShipPart::setAlive(bool var)
-    {
-        this->alive_ = var;
-        orxout() << "ShipPart " << this->getName() << " alive_: " << this->alive_ << endl;
     }
 

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

@@ -72 +72 @@
                 { return this->parent_; }
 
-            void setAlive(bool var);
-            inline bool isAlive()
-                { return this->alive_; }
-
             inline void setEventExecution(bool var)
                 { this->eventExecution_ = var; }
@@ -121 +117 @@
             std::vector<PartDestructionEvent*> eventList_;  // The list of all PartDestructionEvent assigned to this ShipPart.
 
-            bool alive_;
             bool eventExecution_;
 

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