[Orxonox-commit 5969] r10628 - in code/trunk/src/modules: invader towerdefense

[landauf at orxonox.net]

Author: landauf
Date: 2015-10-10 11:40:59 +0200 (Sat, 10 Oct 2015)
New Revision: 10628

Modified:
   code/trunk/src/modules/invader/InvaderEnemyShooter.cc
   code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc
Log:
addendum to r10626 -> pass the collision shape to Pawn::damage

Modified: code/trunk/src/modules/invader/InvaderEnemyShooter.cc
===================================================================
--- code/trunk/src/modules/invader/InvaderEnemyShooter.cc	2015-10-06 19:37:11 UTC (rev 10627)
+++ code/trunk/src/modules/invader/InvaderEnemyShooter.cc	2015-10-10 09:40:59 UTC (rev 10628)
@@ -72,8 +72,8 @@
 
     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);
     }
-}
\ No newline at end of file
+}

Modified: code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc
===================================================================
--- code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc	2015-10-06 19:37:11 UTC (rev 10627)
+++ code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc	2015-10-10 09:40:59 UTC (rev 10628)
@@ -64,7 +64,7 @@
 
     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)
         {
         	orxout() << "damagefunctionIF" << endl;