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

Timestamp:

Nov 19, 2015, 7:55:11 PM (9 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/invader

Files:

• InvaderEnemy.cc (modified) (1 diff)
• InvaderEnemy.h (modified) (1 diff)
• InvaderShip.cc (modified) (1 diff)
• InvaderShip.h (modified) (1 diff)

code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc

@@ -64 +64 @@
     }
 
-    inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
         if(orxonox_cast<InvaderShip*>(otherObject))

code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h

@@ -47 +47 @@
 
             virtual void tick(float dt) override;
-            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
             virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
             virtual void setPlayer(InvaderShip* player){this->player = player;}

code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc

@@ -148 +148 @@
                 getGame()->end();
     }
-    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
         // orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;

code/branches/cpp11_v2/src/modules/invader/InvaderShip.h

@@ -64 +64 @@
             virtual void updateLevel();
 
-            virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
 
         protected: