Changeset 7150 for code/branches/presentation3/src/orxonox/interfaces/Pickupable.h

Timestamp:

Jun 18, 2010, 8:54:01 PM (14 years ago)

Author:

dafrick

Message:

Untangled Pickupable and PickupCarrier a little bit.

File:

• code/branches/presentation3/src/orxonox/interfaces/Pickupable.h (modified) (1 diff)

code/branches/presentation3/src/orxonox/interfaces/Pickupable.h

@@ -95 +95 @@
             virtual void changedPickedUp(void) {}
 
-            bool pickedUp(PickupCarrier* carrier); //!< Sets the Pickupable to picked up.
-            bool dropped(void); //!< Sets the Pickupable to not picked up or dropped.
+            bool pickup(PickupCarrier* carrier);
+            bool drop(bool createSpawner = true);
 
             virtual bool isTarget(PickupCarrier* carrier) const; //!< Get whether the given PickupCarrier is a target of this pickup.