Changeset 10625 for code/trunk/src/modules/invader/InvaderEnemy.h

Timestamp:

Oct 5, 2015, 3:28:39 PM (9 years ago)

Author:

zifloria

Message:

Fixed OrxonoxArcade. Points are awarded again. The problem was that I thought I was overriding a method, when in fact I created a new one because the method signature changed. This could have been prevented with the new c++11 override specifier

File:

• code/trunk/src/modules/invader/InvaderEnemy.h (modified) (1 diff)

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

@@ -48 +48 @@
             virtual void tick(float dt);
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-            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);
             virtual void setPlayer(InvaderShip* player){this->player = player;}