Changeset 8858 for code/trunk/src/modules/pickup/items/ShieldPickup.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/ShieldPickup.cc
r7548 r8858 181 181 if(pawn == NULL) 182 182 { 183 COUT(1) << "Invalid PickupCarrier in ShieldPickup." << std::endl;183 orxout(internal_error, context::pickups) << "Invalid PickupCarrier in ShieldPickup." << endl; 184 184 } 185 185 return pawn; … … 220 220 else 221 221 { 222 COUT(1) << "Invalid duration in ShieldPickup." << std::endl;222 orxout(internal_error, context::pickups) << "Invalid duration in ShieldPickup." << endl; 223 223 this->duration_ = 0.0f; 224 224 } … … 239 239 else 240 240 { 241 COUT(1) << "Invalid Shieldhealth in ShieldPickup." << std::endl;241 orxout(internal_error, context::pickups) << "Invalid Shieldhealth in ShieldPickup." << endl; 242 242 this->shieldHealth_=0; 243 243 } … … 258 258 else 259 259 { 260 COUT(1) << "Invalid Absorption in ShieldPickup." << std::endl;260 orxout(internal_error, context::pickups) << "Invalid Absorption in ShieldPickup." << endl; 261 261 this->shieldAbsorption_=0; 262 262 }
Note: See TracChangeset
for help on using the changeset viewer.