Changeset 8858 for code/trunk/src/modules/pickup/items
- Timestamp:
- Aug 23, 2011, 12:45:53 AM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 8 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/DronePickup.cc
r7548 r8858 179 179 if(pawn == NULL) 180 180 { 181 COUT(1) << "Invalid PickupCarrier in DronePickup." << std::endl;181 orxout(internal_error, context::pickups) << "Invalid PickupCarrier in DronePickup." << endl; 182 182 } 183 183 -
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 } -
code/trunk/src/modules/pickup/items/InvisiblePickup.cc
r8220 r8858 206 206 if(pawn == NULL) 207 207 { 208 COUT(1) << "Invalid PickupCarrier in InvisiblePickup." << std::endl;208 orxout(internal_error, context::pickups) << "Invalid PickupCarrier in InvisiblePickup." << endl; 209 209 } 210 210 return pawn; … … 225 225 else 226 226 { 227 COUT(1) << "Invalid duration in InvisiblePickup." << std::endl;227 orxout(internal_error, context::pickups) << "Invalid duration in InvisiblePickup." << endl; 228 228 this->duration_ = 0.0f; 229 229 } -
code/trunk/src/modules/pickup/items/MetaPickup.cc
r7548 r8858 232 232 } 233 233 else 234 COUT(2) << "Invalid metaType '" << type << "' in MetaPickup." << std::endl;234 orxout(internal_warning, context::pickups) << "Invalid metaType '" << type << "' in MetaPickup." << endl; 235 235 } 236 236 -
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 } -
code/trunk/src/modules/pickup/items/ShrinkPickup.h
r8713 r8858 93 93 */ 94 94 inline void setShrinkFactor(float factor) 95 { if(factor <= 1.0f) { COUT(2) << "Invalid shrinking factor in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkFactor_ = factor; }95 { if(factor <= 1.0f) { orxout(internal_warning, context::pickups) << "Invalid shrinking factor in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkFactor_ = factor; } 96 96 /** 97 97 @brief Get the duration for which the ship remains shrunken. … … 105 105 */ 106 106 inline void setDuration(float duration) 107 { if(duration < 0.0f) { COUT(2) << "Invalid duration in ShrinkPickup. Ignoring.." << endl; return; } this->duration_ = duration; }107 { if(duration < 0.0f) { orxout(internal_warning, context::pickups) << "Invalid duration in ShrinkPickup. Ignoring.." << endl; return; } this->duration_ = duration; } 108 108 /** 109 109 @brief Get the shrink speed. … … 117 117 */ 118 118 inline void setShrinkDuration(float speed) 119 { if(speed <= 0.0f) { COUT(2) << "Invalid shrink duration in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkDuration_ = speed; }119 { if(speed <= 0.0f) { orxout(internal_warning, context::pickups) << "Invalid shrink duration in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkDuration_ = speed; } 120 120 121 121 protected: -
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.