Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 5, 2015, 3:28:39 PM (5 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:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/modules/invader/InvaderEnemy.h

    r10624 r10625  
    4848            virtual void tick(float dt);
    4949            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
    50             virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
     50            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
    5151            virtual void setPlayer(InvaderShip* player){this->player = player;}
    5252
Note: See TracChangeset for help on using the changeset viewer.