[Orxonox-commit 4625] r9296 - code/branches/presentation2012merge/src/modules/pickup

[landauf at orxonox.net]

Author: landauf
Date: 2012-06-12 23:47:59 +0200 (Tue, 12 Jun 2012)
New Revision: 9296

Modified:
   code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc
   code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc
Log:
remove dropped pickups from their collection

Modified: code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc	2012-06-12 21:42:43 UTC (rev 9295)
+++ code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc	2012-06-12 21:47:59 UTC (rev 9296)
@@ -92,7 +92,12 @@
         SUPER(CollectiblePickup, changedPickedUp);
 
         if(this->isInCollection())
-            this->collection_->pickupChangedPickedUp(this->isPickedUp());
+        {
+            if (!this->isPickedUp())
+                this->collection_->removePickupable(this);
+            else
+                this->collection_->pickupChangedPickedUp(this->isPickedUp());
+        }
     }
 
     /**

Modified: code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc	2012-06-12 21:42:43 UTC (rev 9295)
+++ code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc	2012-06-12 21:47:59 UTC (rev 9296)
@@ -72,7 +72,7 @@
         for(std::list<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
         {
             (*it)->wasRemovedFromCollection();
-            (*it)->destroyPickup();
+            (*it)->destroy();
         }
         this->pickups_.clear();