[Orxonox-commit 4654] r9325 - code/branches/presentation2012merge/src/modules/pickup

[landauf at orxonox.net]

Author: landauf
Date: 2012-07-21 23:24:47 +0200 (Sat, 21 Jul 2012)
New Revision: 9325

Modified:
   code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc
   code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.h
Log:
removed obsolete code

Modified: code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc	2012-07-21 21:20:16 UTC (rev 9324)
+++ code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.cc	2012-07-21 21:24:47 UTC (rev 9325)
@@ -61,18 +61,6 @@
 
     /**
     @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.
     */
     void CollectiblePickup::changedUsed(void)

Modified: code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.h
===================================================================
--- code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.h	2012-07-21 21:20:16 UTC (rev 9324)
+++ code/branches/presentation2012merge/src/modules/pickup/CollectiblePickup.h	2012-07-21 21:24:47 UTC (rev 9325)
@@ -70,8 +70,6 @@
             bool isInCollection(void) const
                 { return this->collection_ != NULL; }
 
-            void carrierDestroyed(void); //!< Is called by the PickupCarrier when it is being destroyed.
-
         private:
             void wasAddedToCollection(PickupCollection* collection);
             void wasRemovedFromCollection(void);