Changeset 8858 for code/trunk/src/modules/pickup/Pickup.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/Pickup.cc
r7547 r8858 169 169 else 170 170 { 171 COUT(1) << "Invalid activationType '" << type << "' in pickup." << std::endl;171 orxout(internal_error, context::pickups) << "Invalid activationType '" << type << "' in pickup." << endl; 172 172 } 173 173 } … … 191 191 else 192 192 { 193 COUT(1) << "Invalid durationType '" << type << "' in pickup." << std::endl;193 orxout(internal_error, context::pickups) << "Invalid durationType '" << type << "' in pickup." << endl; 194 194 } 195 195 }
Note: See TracChangeset
for help on using the changeset viewer.