Changeset 10628 for code/trunk

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:

• invader/InvaderEnemyShooter.cc (modified) (1 diff)
• towerdefense/TowerDefenseEnemy.cc (modified) (1 diff)

code/trunk/src/modules/invader/InvaderEnemyShooter.cc

@@ -73 +73 @@
     void InvaderEnemyShooter::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
     {
-        Pawn::damage(damage, healthdamage, shielddamage, originator);
+        Pawn::damage(damage, healthdamage, shielddamage, originator, cs);
         if (getGame() && orxonox_cast<InvaderShip*>(originator) != NULL && getHealth() <= 0)
             getGame()->addPoints(3*42);

code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc

@@ -65 +65 @@
     void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
     {
-        Pawn::damage(damage, healthdamage, shielddamage, originator);
+        Pawn::damage(damage, healthdamage, shielddamage, originator, cs);
         if (getGame() && once_ == false && getHealth() <= 0)
         {