[Orxonox-commit 5967] r10626 - in code/trunk/src/modules: invader towerdefense

[zifloria at orxonox.net]

Author: zifloria
Date: 2015-10-05 15:34:47 +0200 (Mon, 05 Oct 2015)
New Revision: 10626

Modified:
   code/trunk/src/modules/invader/InvaderEnemyShooter.cc
   code/trunk/src/modules/invader/InvaderEnemyShooter.h
   code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc
   code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h
Log:
Fixed more of the same bug. Tower defense was also affected

Modified: code/trunk/src/modules/invader/InvaderEnemyShooter.cc
===================================================================
--- code/trunk/src/modules/invader/InvaderEnemyShooter.cc	2015-10-05 13:28:39 UTC (rev 10625)
+++ code/trunk/src/modules/invader/InvaderEnemyShooter.cc	2015-10-05 13:34:47 UTC (rev 10626)
@@ -70,7 +70,7 @@
         ControllableEntity::fire(0);
     }
 
-    void InvaderEnemyShooter::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
+    void InvaderEnemyShooter::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
     {
         Pawn::damage(damage, healthdamage, shielddamage, originator);
         if (getGame() && orxonox_cast<InvaderShip*>(originator) != NULL && getHealth() <= 0)

Modified: code/trunk/src/modules/invader/InvaderEnemyShooter.h
===================================================================
--- code/trunk/src/modules/invader/InvaderEnemyShooter.h	2015-10-05 13:28:39 UTC (rev 10625)
+++ code/trunk/src/modules/invader/InvaderEnemyShooter.h	2015-10-05 13:34:47 UTC (rev 10626)
@@ -47,7 +47,7 @@
             InvaderEnemyShooter(Context* context);
 
             virtual void tick(float dt);
-            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
+            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
         protected:
             void shoot();
             Timer shootTimer;

Modified: code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc
===================================================================
--- code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc	2015-10-05 13:28:39 UTC (rev 10625)
+++ code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc	2015-10-05 13:34:47 UTC (rev 10626)
@@ -62,7 +62,7 @@
         return game;
     }
 
-    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
+    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
     {
         Pawn::damage(damage, healthdamage, shielddamage, originator);
         if (getGame() && once_ == false && getHealth() <= 0)

Modified: code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h
===================================================================
--- code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h	2015-10-05 13:28:39 UTC (rev 10625)
+++ code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h	2015-10-05 13:34:47 UTC (rev 10626)
@@ -42,7 +42,7 @@
         void popWaypoint();
         TDCoordinate peekWaypoint();
 
-        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
+        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
 
 
     private: