Changeset 8858 for code/trunk/src/modules/pickup/PickupManager.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/modules/pickup/PickupManager.cc
r8729 r8858 72 72 this->defaultRepresentation_ = new PickupRepresentation(); 73 73 74 COUT(3) << "PickupManager created." << std::endl;74 orxout(internal_info, context::pickups) << "PickupManager created." << endl; 75 75 } 76 76 … … 101 101 this->indexes_.clear(); 102 102 103 COUT(3) << "PickupManager destroyed." << std::endl;103 orxout(internal_info, context::pickups) << "PickupManager destroyed." << endl; 104 104 } 105 105 … … 126 126 this->representations_[identifier] = representation; 127 127 128 COUT(4) << "PickupRepresentation &" << representation << " registered with the PickupManager." << std::endl;128 orxout(verbose, context::pickups) << "PickupRepresentation &" << representation << " registered with the PickupManager." << endl; 129 129 return true; 130 130 } … … 151 151 this->representations_.erase(it); 152 152 153 COUT(4) << "PickupRepresentation &" << representation << " unregistered with the PickupManager." << std::endl;153 orxout(verbose, context::pickups) << "PickupRepresentation &" << representation << " unregistered with the PickupManager." << endl; 154 154 return true; 155 155 } … … 208 208 if(it == this->representations_.end()) // If there is no PickupRepresentation associated with the input PickupIdentifier. 209 209 { 210 COUT(4) << "PickupManager::getRepresentation() returned default representation." << std::endl;210 orxout(verbose, context::pickups) << "PickupManager::getRepresentation() returned default representation." << endl; 211 211 return this->defaultRepresentation_; 212 212 } … … 284 284 if(manager.pickupInventoryContainers_.find(pickup) == manager.pickupInventoryContainers_.end()) 285 285 { 286 COUT(1) << "Error: Pickupable &(" << pickup << ") was not registered with PickupManager for the PickupInventory, when it changed used." << std::endl;286 orxout(internal_error, context::pickups) << "Pickupable &(" << pickup << ") was not registered with PickupManager for the PickupInventory, when it changed used." << endl; 287 287 return; 288 288 }
Note: See TracChangeset
for help on using the changeset viewer.