Changeset 10818 for code/branches/cpp11_v2/src/modules/towerdefense

Timestamp:

Nov 19, 2015, 7:55:11 PM (10 years ago)

Author:

muemart

Message:

• Fixed some suspicious virtual function signatures
• Fixed some clang warnings (and errors in the last commit, forgot to mention that)
• Fix compilation without pch
• Hack "override" keyword support into Tolua++

Location:

code/branches/cpp11_v2/src/modules/towerdefense

Files:

• TowerDefenseEnemy.cc (modified) (1 diff)
• TowerDefenseEnemy.h (modified) (1 diff)

code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc

@@ -55 +55 @@
     }
 
-    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/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h

@@ -38 +38 @@
 
         virtual void tick(float dt) override;
-        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) override;
 
     private: