Changeset 5801 for code/branches/core5/src/orxonox/worldentities

Timestamp:

Sep 26, 2009, 10:25:03 PM (15 years ago)

Author:

landauf

Message:

replaced delete with destroy() in orxonox

Location:

code/branches/core5/src/orxonox/worldentities

Files:

• BigExplosion.cc (modified) (4 diffs)
• ControllableEntity.cc (modified) (4 diffs)
• ExplosionChunk.cc (modified) (1 diff)
• MovableEntity.cc (modified) (1 diff)
• WorldEntity.cc (modified) (2 diffs)
• pawns/Pawn.cc (modified) (1 diff)
• pawns/SpaceShip.cc (modified) (2 diffs)

code/branches/core5/src/orxonox/worldentities/BigExplosion.cc

@@ -226 +226 @@
             {
                 this->debris1_->detachOgreObject(this->debrisFire1_->getParticleSystem());
-                delete this->debrisFire1_;
+                this->debrisFire1_->destroy();
             }
             if (this->debrisSmoke1_)
             {
                 this->debris1_->detachOgreObject(this->debrisSmoke1_->getParticleSystem());
-                delete this->debrisSmoke1_;
+                this->debrisSmoke1_->destroy();
             }
 
@@ -237 +237 @@
             {
                 this->debris2_->detachOgreObject(this->debrisFire2_->getParticleSystem());
-                delete this->debrisFire2_;
+                this->debrisFire2_->destroy();
             }
             if (this->debrisSmoke2_)
             {
                 this->debris2_->detachOgreObject(this->debrisSmoke2_->getParticleSystem());
-                delete this->debrisSmoke2_;
+                this->debrisSmoke2_->destroy();
             }
 
@@ -248 +248 @@
             {
                 this->debris3_->detachOgreObject(this->debrisFire3_->getParticleSystem());
-                delete this->debrisFire3_;
+                this->debrisFire3_->destroy();
             }
             if (this->debrisSmoke3_)
             {
                 this->debris3_->detachOgreObject(this->debrisSmoke3_->getParticleSystem());
-                delete this->debrisSmoke3_;
+                this->debrisSmoke3_->destroy();
             }
 
@@ -259 +259 @@
             {
                 this->debris4_->detachOgreObject(this->debrisFire4_->getParticleSystem());
-                delete this->debrisFire4_;
+                this->debrisFire4_->destroy();
             }
             if (this->debrisSmoke4_)
             {
                 this->debris4_->detachOgreObject(this->debrisSmoke4_->getParticleSystem());
-                delete this->debrisSmoke4_;
+                this->debrisSmoke4_->destroy();
             }
         }

code/branches/core5/src/orxonox/worldentities/ControllableEntity.cc

@@ -96 +96 @@
 
             if (this->xmlcontroller_)
-                delete this->xmlcontroller_;
+                this->xmlcontroller_->destroy();
 
             if (this->hud_)
-                delete this->hud_;
+                this->hud_->destroy();
 
             if (this->camera_)
-                delete this->camera_;
+                this->camera_->destroy();
 
             for (std::list<CameraPosition*>::const_iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
-                delete (*it);
+                (*it)->destroy();
 
             if (this->getScene()->getSceneManager())
@@ -259 +259 @@
 
         if (this->bDestroyWhenPlayerLeft_)
-            delete this;
+            this->destroy();
     }
 
@@ -303 +303 @@
         {
             this->camera_->detachFromParent();
-            delete this->camera_;
+            this->camera_->destroy();
             this->camera_ = 0;
         }
@@ -309 +309 @@
         if (this->hud_)
         {
-            delete this->hud_;
+            this->hud_->destroy();
             this->hud_ = 0;
         }

code/branches/core5/src/orxonox/worldentities/ExplosionChunk.cc

@@ -92 +92 @@
             {
                 this->detachOgreObject(this->fire_->getParticleSystem());
-                delete this->fire_;
+                this->fire_->destroy();
             }
             if (this->smoke_)
             {
                 this->detachOgreObject(this->smoke_->getParticleSystem());
-                delete this->smoke_;
+                this->smoke_->destroy();
             }
         }

code/branches/core5/src/orxonox/worldentities/MovableEntity.cc

@@ -61 +61 @@
         if (this->isInitialized())
             if (this->continuousResynchroTimer_)
-                delete this->continuousResynchroTimer_;
+                this->continuousResynchroTimer_->destroy();
     }
 

code/branches/core5/src/orxonox/worldentities/WorldEntity.cc

@@ -119 +119 @@
             {
                 if ((*it)->getDeleteWithParent())
-                    delete (*(it++));
+                    (*(it++))->destroy();
                 else
                 {
@@ -132 +132 @@
                 delete this->physicalBody_;
             }
-            delete this->collisionShape_;
+            this->collisionShape_->destroy();
 
             this->node_->detachAllObjects();

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

@@ -97 +97 @@
 
             if (this->weaponSystem_)
-                delete this->weaponSystem_;
+                this->weaponSystem_->destroy();
         }
     }

code/branches/core5/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -75 +75 @@
     {
         if (this->isInitialized() && this->engine_)
-            delete this->engine_;
+            this->engine_->destroy();
     }
 
@@ -207 +207 @@
                     else
                     {
-                        delete object;
+                        object->destroy();
                     }
                 }