Changeset 6521 for code/branches/pickup3/src/modules/pickup/PickupCollection.cc

Timestamp:

Mar 15, 2010, 7:33:11 AM (14 years ago)

Author:

dafrick

Message:

Added changedPickedUp method to Pickupable to solve a problem in PickupCollection, which, for the most part, works now.

File:

• code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) (2 diffs)

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

@@ -138 +138 @@
     }
     
-    //TODO: Steal description from Pickupable.
     void PickupCollection::changedUsed(void)
     {
@@ -150 +149 @@
     }
     
-    void PickupCollection::changedCarrier()
+    void PickupCollection::changedCarrier(void)
     {
         SUPER(PickupCollection, changedCarrier);
         
+        //! Change used for all Pickupables this PickupCollection consists of.
+        for(std::vector<Pickupable*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
+        {
+            (*it)->setCarrier(this->getCarrier());
+        }
+    }
+    
+    void PickupCollection::changedPickedUp()
+    {
+        SUPER(PickupCollection, changedPickedUp);
+        
         //! Change the carrier for all Pickupables this PickupCollection consists of.
         for(std::vector<Pickupable*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
         {
-            (*it)->setCarrier(this->getCarrier());
-        }
-    }
-    
-    //TODO: Steal description from Pickupable.
+            (*it)->setPickedUp(this->isPickedUp());
+        }
+    }
+    
     void PickupCollection::clone(OrxonoxClass*& item)
     {