Changeset 6497 for code/branches/pickup3/src/orxonox
- Timestamp:
- Mar 8, 2010, 9:17:22 PM (15 years ago)
- Location:
- code/branches/pickup3/src/orxonox/interfaces
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc
r6492 r6497 172 172 173 173 COUT(4) << "Pickupable (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << std::endl; 174 this->setPickedUp(true); 174 175 this->setCarrier(carrier); 175 this->setPickedUp(true);176 176 return true; 177 177 } … … 231 231 Pickupable* Pickupable::clone(void) 232 232 { 233 Pickupable* pickup = NULL; 234 this->clone(pickup); 233 OrxonoxClass* item = NULL; 234 this->clone(item); 235 236 Pickupable* pickup = dynamic_cast<Pickupable*>(item); 235 237 236 238 COUT(4) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << std::endl; … … 246 248 */ 247 249 //TODO: Specify how the implementation must be done in detail. 248 void Pickupable::clone(OrxonoxClass* item)250 void Pickupable::clone(OrxonoxClass*& item) 249 251 { 250 252 SUPER(Pickupable, clone, item); -
code/branches/pickup3/src/orxonox/interfaces/Pickupable.h
r6490 r6497 102 102 103 103 Pickupable* clone(void); //!< Creates a duplicate of the Pickupable. 104 virtual void clone(OrxonoxClass* item); //!< Creates a duplicate of the input OrxonoxClass.104 virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass. 105 105 106 106 /**
Note: See TracChangeset
for help on using the changeset viewer.