Changeset 8858 for code/trunk/src/modules/pickup/items/HealthPickup.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/HealthPickup.cc
r7548 r8858 169 169 break; 170 170 default: 171 COUT(1) << "Invalid healthType in HealthPickup." << std::endl;171 orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl; 172 172 } 173 173 … … 218 218 break; 219 219 default: 220 COUT(1) << "Invalid healthType in HealthPickup." << std::endl;220 orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl; 221 221 } 222 222 … … 234 234 if(pawn == NULL) 235 235 { 236 COUT(1) << "Something went horribly wrong in Health Pickup. PickupCarrier is no Pawn." << std::endl;236 orxout(internal_error, context::pickups) << "Something went horribly wrong in Health Pickup. PickupCarrier is no Pawn." << endl; 237 237 this->Pickupable::destroy(); 238 238 return; … … 268 268 if(pawn == NULL) 269 269 { 270 COUT(1) << "Invalid PickupCarrier in HealthPickup." << std::endl;270 orxout(internal_error, context::pickups) << "Invalid PickupCarrier in HealthPickup." << endl; 271 271 } 272 272 … … 312 312 return HealthPickup::healthTypePermanent_s; 313 313 default: 314 COUT(1) << "Invalid healthType in HealthPickup." << std::endl;314 orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl; 315 315 return BLANKSTRING; 316 316 } … … 331 331 else 332 332 { 333 COUT(1) << "Invalid health in HealthPickup." << std::endl;333 orxout(internal_error, context::pickups) << "Invalid health in HealthPickup." << endl; 334 334 this->health_ = 0.0; 335 335 } … … 350 350 else 351 351 { 352 COUT(1) << "Invalid healthSpeed in HealthPickup." << std::endl;352 orxout(internal_error, context::pickups) << "Invalid healthSpeed in HealthPickup." << endl; 353 353 } 354 354 } … … 376 376 else 377 377 { 378 COUT(1) << "Invalid healthType in HealthPickup." << std::endl;378 orxout(internal_error, context::pickups) << "Invalid healthType in HealthPickup." << endl; 379 379 } 380 380 }
Note: See TracChangeset
for help on using the changeset viewer.