Changeset 6497 for code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc

Timestamp:

Mar 8, 2010, 9:17:22 PM (14 years ago)

Author:

dafrick

Message:

Fixed bug in clone() (Argument needed to be as reference). Pickups seem to be working now (after very sporadic testing), more systematic testing (and probably still some more bug fixes) will follow.

File:

• code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) (3 diffs)

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

@@ -172 +172 @@
         
         COUT(4) << "Pickupable (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << std::endl;
+        this->setPickedUp(true);
         this->setCarrier(carrier);
-        this->setPickedUp(true);
         return true;
     }
@@ -231 +231 @@
     Pickupable* Pickupable::clone(void)
     {
-        Pickupable* pickup = NULL;
-        this->clone(pickup);
+        OrxonoxClass* item = NULL;
+        this->clone(item);
+        
+        Pickupable* pickup = dynamic_cast<Pickupable*>(item);
         
         COUT(4) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << std::endl;
@@ -246 +248 @@
     */
     //TODO: Specify how the implementation must be done in detail.
-    void Pickupable::clone(OrxonoxClass* item)
+    void Pickupable::clone(OrxonoxClass*& item)
     {
         SUPER(Pickupable, clone, item);