Changeset 7094 for code/branches

Timestamp:

Jun 2, 2010, 11:16:20 PM (14 years ago)

Author:

dafrick

Message:

(Hopefully) fix in pickups.

Location:

code/branches/presentation3/src

Files:

• modules/pickup/PickupCollection.cc (modified) (1 diff)
• orxonox/interfaces/Pickupable.cc (modified) (2 diffs)
• orxonox/interfaces/Pickupable.h (modified) (1 diff)

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

@@ -123 +123 @@
         for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
         {
-            (*it).get()->setCarrier(this->getCarrier()->getTarget(*it));
+            (*it).get()->setCarrier(this->getCarrier()->getTarget(*it), true);
         }
     }

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

@@ -213 +213 @@
         Sets the input PickupCarrier as the carrier of the pickup.
     */
-    inline bool Pickupable::setCarrier(PickupCarrier* carrier)
+    inline bool Pickupable::setCarrier(PickupCarrier* carrier, bool tell)
     {
         if(this->carrier_ == carrier)
@@ -222 +222 @@
         this->carrier_ = carrier;
         this->changedCarrier();
+        if(tell && carrier != NULL)
+            this->carrier_->pickups_.insert(this);
         return true;
     }

code/branches/presentation3/src/orxonox/interfaces/Pickupable.h

@@ -115 +115 @@
             bool setUsed(bool used); //!< Sets the Pickupable to used or unused, depending on the input.
             bool setPickedUp(bool pickedUp); //!< Helper method to set the Pickupable to either picked up or not picked up.
-            bool setCarrier(PickupCarrier* carrier); //!< Sets the carrier of the pickup.
+            bool setCarrier(PickupCarrier* carrier, bool tell = false); //!< Sets the carrier of the pickup.
             
         protected: