Changeset 10818 for code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h

Timestamp:

Nov 19, 2015, 7:55:11 PM (8 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++

File:

• code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h

@@ -69 +69 @@
             virtual void fire();
 
-            bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
 
             virtual void addedWeaponPack(WeaponPack* wPack);