Changeset 7162 for code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc

Timestamp:

Aug 8, 2010, 8:53:52 PM (15 years ago)

Author:

dafrick

Message:

Significant structural changes to the pickup module. Lots of bugs found and fixed.
Introduced a new class CollectiblePickup (which is now the only kind a PickupCollection can consist of) to solve some issues cleanly.
MetaPickup received additional functionality. It can now also be set to either destroy all the pickups of a PickupCarrier or destroy the PickupCarrier itself. (This was done mainly for testing purposes)
I've done some extensive testing on the pickups, so they should really work now.

File:

• code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc (modified) (1 diff)

code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc

@@ -133 +133 @@
             if(!this->getTimer()->isActive() && this->getTimer()->getRemainingTime() == this->getDuration())
             {
-                this->destroy();
+                this->Pickupable::destroy();
             }
             else