Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10626


Ignore:
Timestamp:
Oct 5, 2015, 3:34:47 PM (5 years ago)
Author:
zifloria
Message:

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

Location:
code/trunk/src/modules
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/modules/invader/InvaderEnemyShooter.cc

    r9961 r10626  
    7171    }
    7272
    73     void InvaderEnemyShooter::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     73    void InvaderEnemyShooter::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
    7474    {
    7575        Pawn::damage(damage, healthdamage, shielddamage, originator);
  • code/trunk/src/modules/invader/InvaderEnemyShooter.h

    r9943 r10626  
    4848
    4949            virtual void tick(float dt);
    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        protected:
    5252            void shoot();
  • code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc

    r10624 r10626  
    6363    }
    6464
    65     void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     65    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
    6666    {
    6767        Pawn::damage(damage, healthdamage, shielddamage, originator);
  • code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h

    r10624 r10626  
    4343        TDCoordinate peekWaypoint();
    4444
    45         virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
     45        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
    4646
    4747
Note: See TracChangeset for help on using the changeset viewer.