Changeset 8858 for code/trunk/src/orxonox/interfaces/Pickupable.cc
- Timestamp:
- Aug 23, 2011, 12:45:53 AM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:ignore
-
old new 1 1 build 2 2 codeblocks 3 vs 3 4 dependencies
-
- Property svn:mergeinfo changed
/code/branches/output (added) merged: 8739-8740,8765,8771-8772,8774-8780,8787-8789,8794-8799,8801,8803-8812,8814,8816-8817,8820,8822,8825-8837,8840,8844,8846,8848-8850,8853-8854
- Property svn:ignore
-
code/trunk/src/orxonox/interfaces/Pickupable.cc
r8464 r8858 71 71 if(this->pickupIdentifier_ != NULL) 72 72 { 73 COUT(4) << "Pickupable (&" << this << ") destroyed." << std::endl;73 orxout(verbose, context::pickups) << "Pickupable (&" << this << ") destroyed." << endl; 74 74 this->pickupIdentifier_->destroy(); 75 75 } … … 107 107 this->OrxonoxClass::destroy(); 108 108 else 109 COUT(2) << this->getIdentifier()->getName() << " may be unsafe. " << std::endl;109 orxout(internal_warning, context::pickups) << this->getIdentifier()->getName() << " may be unsafe. " << endl; 110 110 } 111 111 … … 126 126 return false; 127 127 128 COUT(4) << "Pickupable (&" << this << ") set to used " << used << "." << std::endl;128 orxout(verbose, context::pickups) << "Pickupable (&" << this << ") set to used " << used << "." << endl; 129 129 130 130 this->used_ = used; … … 201 201 return false; 202 202 203 COUT(4) << "Target " << target->getName() << " added to Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ")." << std::endl;203 orxout(verbose, context::pickups) << "Target " << target->getName() << " added to Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ")." << 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 orxout(internal_warning, context::pickups) << "A Pickupable (&" << this << ") was trying to be added to a PickupCarrier, but was already present." << 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 orxout(verbose, context::pickups) << "Pickupable (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << endl; 229 229 return true; 230 230 } … … 245 245 assert(this->getCarrier()); // The Carrier cannot be NULL at this point. 246 246 if(!this->getCarrier()->removePickup(this)) //TODO Shouldn't this be a little later? 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 249 COUT(4) << "Pickupable (&" << this << ") got dropped up by a PickupCarrier (&" << this->getCarrier() << ")." << std::endl;247 orxout(internal_warning, context::pickups) << "Pickupable (&" << this << ", " << this->getIdentifier()->getName() << ") is being dropped, but it was not present in the PickupCarriers list of pickups." << endl; 248 249 orxout(verbose, context::pickups) << "Pickupable (&" << this << ") got dropped up by a PickupCarrier (&" << this->getCarrier() << ")." << 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 orxout(verbose, context::pickups) << "Pickupable (&" << this << ") set to pickedUp " << pickedUp << "." << 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 orxout(verbose, context::pickups) << "Pickupable (&" << this << ") changed Carrier (& " << carrier << ")." << 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 orxout(verbose, context::pickups) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << endl; 343 343 return pickup; 344 344 }
Note: See TracChangeset
for help on using the changeset viewer.