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

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/items

Files:

• Engine.cc (modified) (2 diffs)
• MultiStateEngine.cc (modified) (1 diff)

code/branches/core5/src/orxonox/items/Engine.cc

@@ -79 +79 @@
 
             if (this->boostBlur_)
-                delete this->boostBlur_;
+                this->boostBlur_->destroy();
 
             if(this->sound_ != NULL)
@@ -237 +237 @@
             if (this->boostBlur_)
             {
-                delete this->boostBlur_;
+                this->boostBlur_->destroy();
                 this->boostBlur_ = 0;
             }

code/branches/core5/src/orxonox/items/MultiStateEngine.cc

@@ -60 +60 @@
             // We have no ship, so the effects are not attached and won't be destroyed automatically
             for (std::list<WorldEntity*>::const_iterator it = this->activeEffects_.begin(); it != this->activeEffects_.end(); ++it)
-                delete (*it);
+                (*it)->destroy();
             for (std::list<WorldEntity*>::const_iterator it = this->forwardEffects_.begin(); it != this->forwardEffects_.end(); ++it)
-                delete (*it);
+                (*it)->destroy();
             for (std::list<WorldEntity*>::const_iterator it = this->boostEffects_.begin(); it != this->boostEffects_.end(); ++it)
-                delete (*it);
+                (*it)->destroy();
             for (std::list<WorldEntity*>::const_iterator it = this->brakeEffects_.begin(); it != this->brakeEffects_.end(); ++it)
-                delete (*it);
+                (*it)->destroy();
         }
     }