Changeset 10845 for code/branches/cpp11_v2/src/orxonox/worldentities/pawns

Timestamp:

Nov 23, 2015, 10:20:29 PM (10 years ago)

Author:

landauf

Message:

always use 'virtual' in the declaration of virtual functions even if they are inherited

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, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
 
             virtual void addedWeaponPack(WeaponPack* wPack);