Changeset 11061

Timestamp:

Jan 13, 2016, 11:02:33 PM (8 years ago)

Author:

landauf

Message:

made some functions non-virtual

Location:

code/branches/cpp11_v3/src

Files:

• modules/overlays/hud/HUDHealthBar.h (modified) (1 diff)
• modules/weapons/projectiles/Rocket.h (modified) (2 diffs)
• orxonox/overlays/OrxonoxOverlay.h (modified) (1 diff)

code/branches/cpp11_v3/src/modules/overlays/hud/HUDHealthBar.h

@@ -115 +115 @@
             virtual void sizeChanged();
         private:
-            virtual void positionText();
+            void positionText();
             WeakPtr<Pawn> owner_;
             StrongPtr<OverlayText> textoverlay_;

code/branches/cpp11_v3/src/modules/weapons/projectiles/Rocket.h

@@ -121 +121 @@
             @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.
@@ -127 +127 @@
             inline float getMaxFuel() const
                 { return lifetime_; }
-            virtual float getFuel() const;
+            float getFuel() const;
 
         private:

code/branches/cpp11_v3/src/orxonox/overlays/OrxonoxOverlay.h

@@ -186 +186 @@
         virtual void changedOverlayGroup()
             { this->changedVisibility(); }
-        virtual void setZOrder(unsigned short order);
+        void setZOrder(unsigned short order);
 
     protected: