Changeset 8858 for code/trunk/src/modules/pickup/items/SpeedPickup.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/items/SpeedPickup.cc
r8727 r8858 180 180 if(ship == NULL) 181 181 { 182 COUT(1) << "Invalid PickupCarrier in SpeedPickup." << std::endl;182 orxout(internal_error, context::pickups) << "Invalid PickupCarrier in SpeedPickup." << endl; 183 183 } 184 184 … … 221 221 else 222 222 { 223 COUT(1) << "Invalid duration in SpeedPickup." << std::endl;223 orxout(internal_error, context::pickups) << "Invalid duration in SpeedPickup." << endl; 224 224 this->duration_ = 0.0f; 225 225 } … … 240 240 else 241 241 { 242 COUT(1) << "Invalid speedAdd in SpeedPickup." << std::endl;242 orxout(internal_error, context::pickups) << "Invalid speedAdd in SpeedPickup." << endl; 243 243 this->speedAdd_ = 0.0f; 244 244 } … … 259 259 else 260 260 { 261 COUT(1) << "Invalid speedMultiply in SpeedPickup." << std::endl;261 orxout(internal_error, context::pickups) << "Invalid speedMultiply in SpeedPickup." << endl; 262 262 this->speedMultiply_ = 1.0f; 263 263 }
Note: See TracChangeset
for help on using the changeset viewer.