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

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

Files:

• DroppedItem.cc (modified) (2 diffs)
• ModifierPickup.cc (modified) (1 diff)
• PickupSpawner.cc (modified) (2 diffs)
• items/HealthImmediate.cc (modified) (1 diff)
• items/HealthUsable.cc (modified) (1 diff)
• items/Jump.cc (modified) (1 diff)

code/branches/core5/src/orxonox/pickup/DroppedItem.cc

@@ -69 +69 @@
         {
             COUT(3) << "DroppedItem '" << this->item_->getPickupIdentifier() << "' picked up." << std::endl;
-            delete this;
+            this->destroy();
         }
     }
@@ -85 +85 @@
         {
             COUT(3) << "Delete DroppedItem with '" << this->item_->getPickupIdentifier() << "'" << std::endl;
-            delete this->item_;
+            this->item_->destroy();
         }
 
-        delete this;
+        this->destroy();
     }
 

code/branches/core5/src/orxonox/pickup/ModifierPickup.cc

@@ -139 +139 @@
                 this->timer_.stopTimer();
 
-            delete this;
+            this->destroy();
 
             return true;

code/branches/core5/src/orxonox/pickup/PickupSpawner.cc

@@ -91 +91 @@
             asItem->addTemplate(this->itemTemplate_);
             PickupInventory::getImageForItem(asItem);
-            delete newObject;
+            newObject->destroy();
         }
 
@@ -174 +174 @@
                 }
                 else
-                    delete newObject;
+                    newObject->destroy();
             }
         }

code/branches/core5/src/orxonox/pickup/items/HealthImmediate.cc

@@ -67 +67 @@
         {
             pawn->addHealth(this->recoveredHealth_);
-            delete this;
+            this->destroy();
         }
 

code/branches/core5/src/orxonox/pickup/items/HealthUsable.cc

@@ -82 +82 @@
 
             this->removeFrom(pawn);
-            delete this;
+            this->destroy();
         }
     }

code/branches/core5/src/orxonox/pickup/items/Jump.cc

@@ -84 +84 @@
         {
             this->removeFrom(pawn);
-            delete this;
+            this->destroy();
         }
     }