Changeset 10216 for code/trunk/src/orxonox/worldentities/pawns/Pawn.cc
- Timestamp:
- Jan 31, 2015, 6:03:17 PM (9 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/worldentities/pawns/Pawn.cc
r9950 r10216 244 244 } 245 245 246 void Pawn::damage(float damage, float healthdamage, float shielddamage, Pawn* originator )246 void Pawn::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) 247 247 { 248 248 // Applies multiplier given by the DamageBoost Pickup. … … 279 279 280 280 */ 281 void Pawn::hit(Pawn* originator, const Vector3& force, float damage, float healthdamage, float shielddamage)281 void Pawn::hit(Pawn* originator, const Vector3& force, const btCollisionShape* cs, float damage, float healthdamage, float shielddamage) 282 282 { 283 283 if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) ) 284 284 { 285 this->damage(damage, healthdamage, shielddamage, originator );285 this->damage(damage, healthdamage, shielddamage, originator, cs); 286 286 this->setVelocity(this->getVelocity() + force); 287 287 } 288 288 } 289 289 290 291 void Pawn::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage, float healthdamage, float shielddamage) 290 void Pawn::hit(Pawn* originator, btManifoldPoint& contactpoint, const btCollisionShape* cs, float damage, float healthdamage, float shielddamage) 292 291 { 293 292 if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) ) 294 293 { 295 this->damage(damage, healthdamage, shielddamage, originator );294 this->damage(damage, healthdamage, shielddamage, originator, cs); 296 295 297 296 if ( this->getController() ) … … 559 558 return BLANKSTRING; 560 559 } 561 562 563 560 }
Note: See TracChangeset
for help on using the changeset viewer.