[Orxonox-commit 6404] r11061 - in code/branches/cpp11_v3/src: modules/overlays/hud modules/weapons/projectiles orxonox/overlays

[landauf at orxonox.net]

Author: landauf
Date: 2016-01-13 23:02:33 +0100 (Wed, 13 Jan 2016)
New Revision: 11061

Modified:
   code/branches/cpp11_v3/src/modules/overlays/hud/HUDHealthBar.h
   code/branches/cpp11_v3/src/modules/weapons/projectiles/Rocket.h
   code/branches/cpp11_v3/src/orxonox/overlays/OrxonoxOverlay.h
Log:
made some functions non-virtual

Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDHealthBar.h
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDHealthBar.h	2016-01-13 21:40:06 UTC (rev 11060)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDHealthBar.h	2016-01-13 22:02:33 UTC (rev 11061)
@@ -114,7 +114,7 @@
             virtual void positionChanged();
             virtual void sizeChanged();
         private:
-            virtual void positionText();
+            void positionText();
             WeakPtr<Pawn> owner_;
             StrongPtr<OverlayText> textoverlay_;
             bool bUseBarColour_;

Modified: code/branches/cpp11_v3/src/modules/weapons/projectiles/Rocket.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/projectiles/Rocket.h	2016-01-13 21:40:06 UTC (rev 11060)
+++ code/branches/cpp11_v3/src/modules/weapons/projectiles/Rocket.h	2016-01-13 22:02:33 UTC (rev 11061)
@@ -120,13 +120,13 @@
             /**
             @brief Set the maximum lifetime of the rocket.
             */
-            virtual void setMaxFuel(float fuel);
+            void setMaxFuel(float fuel);
             /**
             @brief Get the maximum lifetime of the rocket.
             */
             inline float getMaxFuel() const
                 { return lifetime_; }
-            virtual float getFuel() const;
+            float getFuel() const;
 
         private:
             Vector3 localAngularVelocity_; //!< Variable to temporarily store accumulated steering command input.

Modified: code/branches/cpp11_v3/src/orxonox/overlays/OrxonoxOverlay.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/overlays/OrxonoxOverlay.h	2016-01-13 21:40:06 UTC (rev 11060)
+++ code/branches/cpp11_v3/src/orxonox/overlays/OrxonoxOverlay.h	2016-01-13 22:02:33 UTC (rev 11061)
@@ -185,7 +185,7 @@
             { return this->group_; }
         virtual void changedOverlayGroup()
             { this->changedVisibility(); }
-        virtual void setZOrder(unsigned short order);
+        void setZOrder(unsigned short order);
 
     protected:
         virtual void angleChanged();