Changeset 6477 for code/branches/pickup3/src/orxonox

Timestamp:

Mar 6, 2010, 7:44:04 PM (15 years ago)

Author:

dafrick

Message:

Some more documenting. Completed HealthPickup.

Location:

code/branches/pickup3/src/orxonox/interfaces

Files:

• PickupCarrier.h (modified) (1 diff)
• Pickupable.cc (modified) (1 diff)

code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h

@@ -76 +76 @@
             @brief Can be called to drop a Pickupable.
             @param pickup A pointer to the Pickupable.
+            @param drop If the Pickupable should just be removed from the PickupCarrier without further action, this can be set to false. true is default.
             @return Returns true if the Pickupable has been dropped, false if not.
             */
-            bool drop(Pickupable* pickup)
+            bool drop(Pickupable* pickup, bool drop = true)
                 { 
                    bool dropped = this->pickups_.erase(pickup) == 1;
-                   if(dropped)
+                   if(dropped && drop)
                    {
                        pickup->dropped();

code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc

@@ -63 +63 @@
     Pickupable::~Pickupable()
     {
-        
+        if(this->isUsed())
+            this->setUsed(false);
+        
+        if(this->isPickedUp())
+        {
+            this->getCarrier()->drop(this, false);
+            this->setCarrier(NULL);
+        }
     }