Changeset 6521 for code/branches/pickup3/src/modules/pickup

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.

Location:

code/branches/pickup3/src/modules/pickup

Files:

• Pickup.cc (modified) (1 diff)
• Pickup.h (modified) (1 diff)
• PickupCollection.cc (modified) (2 diffs)
• PickupCollection.h (modified) (1 diff)

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

@@ -182 +182 @@
     @brief
         Should be called when the pickup has transited from picked up to dropped or the other way around.
-        Any Class overwriting this method must call its SUPER function by adding SUPER(Classname, changedCarrier); to their changedCarrier method.
-    */
-    void Pickup::changedCarrier(void)
-    {
-        SUPER(Pickup, changedCarrier);
+        Any Class overwriting this method must call its SUPER function by adding SUPER(Classname, changedPickedUp); to their changedPickedUp method.
+    */
+    void Pickup::changedPickedUp(void)
+    {
+        SUPER(Pickup, changedPickedUp);
         
         //! Sets the Pickup to used if the Pickup has activation type 'immediate' and gets picked up.

code/branches/pickup3/src/modules/pickup/Pickup.h

@@ -117 +117 @@
                 { return this->getDurationTypeDirect() == pickupDurationType::continuous; }
             
-            virtual void changedCarrier(void); //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
+            virtual void changedPickedUp(void); //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
                                     
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the Pickup.

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)
     {

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

@@ -58 +58 @@
 
             virtual void changedUsed(void);
-            
             virtual void changedCarrier(void);
+            virtual void changedPickedUp(void);
             
             virtual void clone(OrxonoxClass*& item);