Changeset 10626 for code/trunk

Timestamp:

Oct 5, 2015, 3:34:47 PM (9 years ago)

Author:

zifloria

Message:

Fixed more of the same bug. Tower defense was also affected

Location:

code/trunk/src/modules

Files:

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

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

@@ -71 +71 @@
     }
 
-    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);

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

@@ -48 +48 @@
 
             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();

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

@@ -63 +63 @@
     }
 
-    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);

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

@@ -43 +43 @@
         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);