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

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++

File:

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

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

@@ -282 +282 @@
     }
 
-    bool FpsPlayer::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    bool FpsPlayer::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
         if (contactPoint.m_normalWorldOnB.y() > 0.6)