Changeset 9325 for code/branches/presentation2012merge/src

Timestamp:

Jul 21, 2012, 11:24:47 PM (12 years ago)

Author:

landauf

Message:

removed obsolete code

Location:

code/branches/presentation2012merge/src/modules/pickup

Files:

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

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

@@ -62 +62 @@
     /**
     @brief
-        Is called by the PickupCarrier when it is being destroyed.
-    */
-    void CollectiblePickup::carrierDestroyed(void)
-    {
-        if(!this->isInCollection())
-            this->Pickupable::destroy();
-        else // If the CollectiblePickup is part of a PickupCollection it is just dropped instead of destroyed.
-            this->drop(false);
-    }
-
-    /**
-    @brief
         Is called when the pickup has transited from used to unused or the other way around.
     */

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

@@ -71 +71 @@
                 { return this->collection_ != NULL; }
 
-            void carrierDestroyed(void); //!< Is called by the PickupCarrier when it is being destroyed.
-
         private:
             void wasAddedToCollection(PickupCollection* collection);