Changeset 7094 for code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc

Timestamp:

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

Author:

dafrick

Message:

(Hopefully) fix in pickups.

File:

• code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc (modified) (2 diffs)

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;
     }