Changeset 7077 for code/branches/presentation3/src/orxonox/worldentities/Drone.cc

Timestamp:

Jun 2, 2010, 1:52:21 AM (14 years ago)

Author:

landauf

Message:

delete → destroy()

File:

• code/branches/presentation3/src/orxonox/worldentities/Drone.cc (modified) (6 diffs)

code/branches/presentation3/src/orxonox/worldentities/Drone.cc

@@ -44 +44 @@
 
         this->myController_ = 0;
-        
+
         this->localLinearAcceleration_.setValue(0, 0, 0);
         this->localAngularAcceleration_.setValue(0, 0, 0);
         this->setRadarVisibility(false);
         this->setCollisionType(WorldEntity::Dynamic);
-        
+
         myController_ = new DroneController(static_cast<BaseObject*>(this)); //!< Creates a new controller and passes our this pointer to it as creator.
         myController_->setDrone(this);
@@ -63 +63 @@
     {
         if( this->isInitialized() && this->myController_ )
-            delete this->myController_;
+            this->myController_->destroy();
     }
 
@@ -92 +92 @@
     {
         SUPER(Drone, tick, dt);
-        
+
         //if (this->hasLocalController())
         //{
@@ -103 +103 @@
             this->physicalBody_->applyCentralForce(physicalBody_->getWorldTransform().getBasis() * this->localLinearAcceleration_);
             this->localLinearAcceleration_.setValue(0, 0, 0);
-        
+
             this->localAngularAcceleration_ *= this->getLocalInertia() * this->rotationThrust_;
             this->physicalBody_->applyTorque(physicalBody_->getWorldTransform().getBasis() * this->localAngularAcceleration_);
@@ -109 +109 @@
         //}
     }
-    
+
     /**
     @brief
@@ -175 +175 @@
         this->localAngularAcceleration_.setZ(this->localAngularAcceleration_.z() + value.x);
     }
-    
+
 }