Changeset 6492 for code

Timestamp:

Mar 8, 2010, 12:49:25 PM (15 years ago)

Author:

dafrick

Message:

Small error in Pickup Spawner.

Location:

code/branches/pickup3/src

Files:

• modules/pickup/PickupSpawner.cc (modified) (1 diff)
• orxonox/interfaces/Pickupable.cc (modified) (1 diff)

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

@@ -293 +293 @@
             Pickupable* pickup = this->getPickup();
             
-            if(target != NULL || pickup != NULL)
-            {
-                if(carrier->pickup(pickup))
+            if(target != NULL && pickup != NULL)
+            {
+                if(target->pickup(pickup))
                 {
                     this->decrementSpawnsRemaining();

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

@@ -196 +196 @@
         
         this->setCarrier(NULL);
+        //TODO: possible problem.
         if(!created)
             this->destroy();