Changeset 9296
- Timestamp:
- Jun 12, 2012, 11:47:59 PM (13 years ago)
- Location:
- code/branches/presentation2012merge/src/modules/pickup
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc
r9290 r9296 93 93 94 94 if(this->isInCollection()) 95 this->collection_->pickupChangedPickedUp(this->isPickedUp()); 95 { 96 if (!this->isPickedUp()) 97 this->collection_->removePickupable(this); 98 else 99 this->collection_->pickupChangedPickedUp(this->isPickedUp()); 100 } 96 101 } 97 102 -
code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc
r9295 r9296 73 73 { 74 74 (*it)->wasRemovedFromCollection(); 75 (*it)->destroy Pickup();75 (*it)->destroy(); 76 76 } 77 77 this->pickups_.clear();
Note: See TracChangeset
for help on using the changeset viewer.