Changeset 9294 for code/branches/presentation2012merge

Timestamp:

Jun 12, 2012, 11:05:15 PM (13 years ago)

Author:

landauf

Message:

removed 2 lines from ~PickupCollection() again because they don't solve the real issue
use destroy() for PickupCollectionIdentifier because it's an OrxonoxClass
calling this→destroy() should be the last thing you do in a function
details in PickupIdentifier

Location:

code/branches/presentation2012merge/src

Files:

• modules/pickup/PickupCollection.cc (modified) (3 diffs)
• orxonox/pickup/PickupIdentifier.cc (modified) (1 diff)
• orxonox/pickup/PickupIdentifier.h (modified) (1 diff)

code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc

@@ -75 +75 @@
         for(std::list<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
         {
-            if((*it)->isBeingDestroyed())
-                continue;
-
             (*it)->wasRemovedFromCollection();
             (*it)->destroyPickup();
@@ -84 +81 @@
 
         if(this->pickupCollectionIdentifier_ != NULL)
-            delete this->pickupCollectionIdentifier_;
+            this->pickupCollectionIdentifier_->destroy();
     }
 
@@ -187 +184 @@
         if(this->pickedUpCounter_ <= this->disabledCounter_ && this->isPickedUp())
             this->Pickupable::destroy();
-
-        // If the PickupCollection is no longer picked up.
-        if(!this->isPickedUp())
+        else if(!this->isPickedUp()) // If the PickupCollection is no longer picked up.
             this->pickedUpCounter_ = 0;
     }

code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.cc

@@ -113 +113 @@
         Returns false if the parameter already existed, true if not.
     */
-    bool PickupIdentifier::addParameter(std::string & name, std::string & value)
+    bool PickupIdentifier::addParameter(const std::string& name, const std::string& value)
     {
         orxout(verbose, context::pickups) << "PickupIdentifier " << name << ", " << value << endl;

code/branches/presentation2012merge/src/orxonox/pickup/PickupIdentifier.h

@@ -72 +72 @@
             virtual int compare(const PickupIdentifier* identifier) const; //!< Compares two PickupIdentifiers and returns 0 if a == b, <0 if a < b and >0 if a > b for a.compare(b).
 
-            bool addParameter(std::string & name, std::string & value); //!< Add a parameter to the PickupIdentifier.
+            bool addParameter(const std::string& name, const std::string& value); //!< Add a parameter to the PickupIdentifier.
 
         private: