[Orxonox-commit 4653] r9324 - code/branches/presentation2012merge/src/modules/pickup

[landauf at orxonox.net]

Author: landauf
Date: 2012-07-21 23:20:16 +0200 (Sat, 21 Jul 2012)
New Revision: 9324

Modified:
   code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc
Log:
fixed dropping and picking up again a PickupCollection

Modified: code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc	2012-07-21 16:32:02 UTC (rev 9323)
+++ code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc	2012-07-21 21:20:16 UTC (rev 9324)
@@ -92,12 +92,7 @@
         SUPER(CollectiblePickup, changedPickedUp);
 
         if(this->isInCollection())
-        {
-            if (!this->isPickedUp())
-                this->collection_->removePickupable(this);
-            else
-                this->collection_->pickupChangedPickedUp(this->isPickedUp());
-        }
+            this->collection_->pickupChangedPickedUp(this->isPickedUp());
     }
 
     /**