Changeset 9296 for code/branches/presentation2012merge

Timestamp:

Jun 12, 2012, 11:47:59 PM (12 years ago)

Author:

landauf

Message:

remove dropped pickups from their collection

Location:

code/branches/presentation2012merge/src/modules/pickup

Files:

• CollectiblePickup.cc (modified) (1 diff)
• PickupCollection.cc (modified) (1 diff)

code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc

@@ -93 +93 @@
 
         if(this->isInCollection())
-            this->collection_->pickupChangedPickedUp(this->isPickedUp());
+        {
+            if (!this->isPickedUp())
+                this->collection_->removePickupable(this);
+            else
+                this->collection_->pickupChangedPickedUp(this->isPickedUp());
+        }
     }
 

code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc

@@ -73 +73 @@
         {
             (*it)->wasRemovedFromCollection();
-            (*it)->destroyPickup();
+            (*it)->destroy();
         }
         this->pickups_.clear();