Changeset 5801 for code/branches/core5/src/orxonox/worldentities/ControllableEntity.cc

Timestamp:

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

Author:

landauf

Message:

replaced delete with destroy() in orxonox

File:

• code/branches/core5/src/orxonox/worldentities/ControllableEntity.cc (modified) (4 diffs)

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