Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10628 for code/trunk/src


Ignore:
Timestamp:
Oct 10, 2015, 11:40:59 AM (9 years ago)
Author:
landauf
Message:

addendum to r10626 → pass the collision shape to Pawn::damage

Location:
code/trunk/src/modules
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/modules/invader/InvaderEnemyShooter.cc

    r10626 r10628  
    7373    void InvaderEnemyShooter::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
    7474    {
    75         Pawn::damage(damage, healthdamage, shielddamage, originator);
     75        Pawn::damage(damage, healthdamage, shielddamage, originator, cs);
    7676        if (getGame() && orxonox_cast<InvaderShip*>(originator) != NULL && getHealth() <= 0)
    7777            getGame()->addPoints(3*42);
  • code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc

    r10626 r10628  
    6565    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
    6666    {
    67         Pawn::damage(damage, healthdamage, shielddamage, originator);
     67        Pawn::damage(damage, healthdamage, shielddamage, originator, cs);
    6868        if (getGame() && once_ == false && getHealth() <= 0)
    6969        {
Note: See TracChangeset for help on using the changeset viewer.