Changeset 6539 for code

Timestamp:

Mar 16, 2010, 6:23:06 PM (15 years ago)

Author:

dafrick

Message:

Ups. Complies and runs now.

Location:

code/trunk/src

Files:

• modules/pickup/items/MetaPickup.h (modified) (1 diff)
• orxonox/interfaces/Pickupable.h (modified) (1 diff)

code/trunk/src/modules/pickup/items/MetaPickup.h

@@ -79 +79 @@
             
         protected:
-            void initialize(void); //!< Initializes the object.
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
             

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

@@ -95 +95 @@
             virtual void changedPickedUp(void) {}
             
-            //TODO: Better private, or protected?
             bool pickedUp(PickupCarrier* carrier); //!< Sets the Pickupable to picked up.
             bool dropped(void); //!< Sets the Pickupable to not picked up or dropped.