Changeset 7552 for code/trunk/src/orxonox/interfaces/Pickupable.h

Timestamp:

Oct 17, 2010, 10:50:43 PM (14 years ago)

Author:

dafrick

Message:

Resolving some TODOs and doing some additional cleanup. Almost done now…

File:

• code/trunk/src/orxonox/interfaces/Pickupable.h (modified) (3 diffs)

code/trunk/src/orxonox/interfaces/Pickupable.h

@@ -62 +62 @@
     class _OrxonoxExport Pickupable : virtual public OrxonoxClass, public Rewardable
     {
+        friend class PickupCarrier;
+
         protected:
             Pickupable(); //!< Default constructor.
@@ -146 +148 @@
             bool setUsed(bool used); //!< Sets the Pickupable to used or unused, depending on the input.
             bool setPickedUp(bool pickedUp); //!< Helper method to set the Pickupable to either picked up or not picked up.
-            //TODO: private?
             bool setCarrier(PickupCarrier* carrier, bool tell = true); //!< Sets the carrier of the Pickupable.
-
-            //TODO: private?
-            virtual void carrierDestroyed(void); //!< Is called by the PickupCarrier when it is being destroyed.
 
             void destroy(void); //!< Is called internally within the Pickupable module to destroy pickups.
@@ -162 +160 @@
             virtual void preDestroy(void); //!< A method that is called by OrxonoxClass::destroy() before the object is actually destroyed.
             virtual void destroyPickup(void); //!< Destroys a Pickupable.
+            virtual void carrierDestroyed(void); //!< Is called by the PickupCarrier when it is being destroyed.
 
             /**