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.cc

    r10624 r10625  
    7979    }
    8080
    81     void InvaderEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     81    void InvaderEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
    8282    {
    83         Pawn::damage(damage, healthdamage, shielddamage, originator);
     83        Pawn::damage(damage, healthdamage, shielddamage, originator, cs);
    8484        if (getGame() && orxonox_cast<InvaderShip*>(originator) != NULL && getHealth() <= 0)
    8585            getGame()->addPoints(42);
Note: See TracChangeset for help on using the changeset viewer.