Changeset 8306 for code/trunk/src
- Timestamp:
- Apr 22, 2011, 9:51:25 PM (14 years ago)
- Location:
- code/trunk/src/orxonox/interfaces
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/interfaces/PickupCarrier.cc
r8303 r8306 111 111 delete children; 112 112 113 return false;113 return isTarget; 114 114 } 115 115 -
code/trunk/src/orxonox/interfaces/Pickupable.cc
r7547 r8306 126 126 return false; 127 127 128 COUT(4) << "Pickupable ( &" << this << ") set to used " << used << "." << std::endl;128 COUT(4) << "Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") set to used " << used << "." << std::endl; 129 129 130 130 this->used_ = used; … … 201 201 return false; 202 202 203 COUT(4) << "Target " << target->getName() << " added to Pickupable ( &" << this << ")." << std::endl;203 COUT(4) << "Target " << target->getName() << " added to Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ")." << std::endl; 204 204 this->targets_.push_back(target); 205 205 return true; … … 221 221 if(!this->setCarrier(carrier)) 222 222 { 223 COUT(3) << "A Pickupable ( &" << this << ") was trying to be added to a PickupCarrier, but was already present." << std::endl;223 COUT(3) << "A Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") was trying to be added to a PickupCarrier, but was already present." << std::endl; 224 224 return false; 225 225 } 226 226 227 227 this->setPickedUp(true); 228 COUT(4) << "Pickupable ( &" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << std::endl;228 COUT(4) << "Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << std::endl; 229 229 return true; 230 230 } … … 247 247 COUT(2) << "Pickupable (&" << this << ", " << this->getIdentifier()->getName() << ") is being dropped, but it was not present in the PickupCarriers list of pickups." << std::endl; 248 248 249 COUT(4) << "Pickupable ( &" << this << ") got dropped up by a PickupCarrier (&" << this->getCarrier() << ")." << std::endl;249 COUT(4) << "Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") got dropped up by a PickupCarrier (&" << this->getCarrier() << ")." << std::endl; 250 250 this->setUsed(false); 251 251 this->setPickedUp(false); … … 276 276 return false; 277 277 278 COUT(4) << "Pickupable ( &" << this << ") set to pickedUp " << pickedUp << "." << std::endl;278 COUT(4) << "Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") set to pickedUp " << pickedUp << "." << std::endl; 279 279 280 280 this->pickedUp_ = pickedUp; … … 305 305 return false; 306 306 307 COUT(4) << "Pickupable ( &" << this << ") changed Carrier (& " << carrier << ")." << std::endl;307 COUT(4) << "Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") changed Carrier (& " << carrier << ")." << std::endl; 308 308 309 309 if(carrier != NULL && tell) … … 340 340 Pickupable* pickup = dynamic_cast<Pickupable*>(item); 341 341 342 COUT(4) << "Pickupable ( &" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << std::endl;342 COUT(4) << "Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << std::endl; 343 343 return pickup; 344 344 }
Note: See TracChangeset
for help on using the changeset viewer.