Changeset 10845 for code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h

Timestamp:

Nov 23, 2015, 10:20:29 PM (8 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/ControllableEntity.h (modified) (2 diffs)

code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h

@@ -141 +141 @@
             using MobileEntity::setAngularVelocity;
 
-            void setPosition(const Vector3& position) override;
-            void setOrientation(const Quaternion& orientation) override;
-            void setVelocity(const Vector3& velocity) override;
-            void setAngularVelocity(const Vector3& velocity) override;
+            virtual void setPosition(const Vector3& position) override;
+            virtual void setOrientation(const Quaternion& orientation) override;
+            virtual void setVelocity(const Vector3& velocity) override;
+            virtual void setAngularVelocity(const Vector3& velocity) override;
 
             inline bool hasLocalController() const
@@ -214 +214 @@
 
             // Bullet btMotionState related
-            void setWorldTransform(const btTransform& worldTrans) override;
+            virtual void setWorldTransform(const btTransform& worldTrans) override;
 
             unsigned int server_overwrite_;