Changeset 11054 for code/branches/cpp11_v3/src/orxonox/worldentities/pawns/FpsPlayer.h

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/FpsPlayer.h (modified) (1 diff)

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

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