[Orxonox-commit 6407] r11064 - in code/branches/cpp11_v3/src: modules/overlays/hud modules/pickup/items modules/weapons/projectiles orxonox/weaponsystem

[landauf at orxonox.net]

Author: landauf
Date: 2016-01-14 22:58:46 +0100 (Thu, 14 Jan 2016)
New Revision: 11064

Modified:
   code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h
   code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h
   code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.h
   code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.h
   code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.h
   code/branches/cpp11_v3/src/orxonox/weaponsystem/ReplenishingMunition.h
Log:
made some functions non-virtual

Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h	2016-01-14 21:27:10 UTC (rev 11063)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h	2016-01-14 21:58:46 UTC (rev 11064)
@@ -63,7 +63,7 @@
         virtual void positionChanged();
         virtual void sizeChanged();
 
-        virtual void setWeapon(Weapon* weapon);
+        void setWeapon(Weapon* weapon);
 
         inline void setWeaponModeHUDActualSize(Vector2 vector)
             { weaponModeHUDActualSize_ = vector;
@@ -83,12 +83,12 @@
             }        
 
     private:
-        virtual void createHUDChilds();
-        virtual void positionHUDChilds();
-        virtual void destroyHUDChilds();
-        virtual void updateWeaponModeList();
-        virtual void updateSize();
-        virtual void updatePosition();
+        void createHUDChilds();
+        void positionHUDChilds();
+        void destroyHUDChilds();
+        void updateWeaponModeList();
+        void updateSize();
+        void updatePosition();
 
         WeakPtr<Pawn> owner_;
         WeakPtr<Weapon> weapon_;

Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h	2016-01-14 21:27:10 UTC (rev 11063)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h	2016-01-14 21:58:46 UTC (rev 11064)
@@ -64,7 +64,7 @@
         virtual void positionChanged();
         virtual void sizeChanged();
 
-        virtual void setWeaponMode(WeaponMode* weaponMode);
+        void setWeaponMode(WeaponMode* weaponMode);
 
         inline void setWeaponModeHUDActualSize(Vector2 vector)
             { weaponModeHUDActualSize_ = vector;
@@ -87,9 +87,9 @@
             }
 
     private:
-        virtual void updateSize();
-        virtual void updatePosition();
-        virtual void positionHUDChilds();
+        void updateSize();
+        void updatePosition();
+        void positionHUDChilds();
 
         WeakPtr<Pawn> owner_;
         WeakPtr<WeaponMode> weaponMode_;

Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.h
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.h	2016-01-14 21:27:10 UTC (rev 11063)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.h	2016-01-14 21:58:46 UTC (rev 11064)
@@ -63,10 +63,10 @@
         inline Vector2 getWeaponModeHUDSize() const
             { return weaponModeHUDSize_; }
     private:
-        virtual void updateWeaponList();
-        virtual void createHUDChilds();
-        virtual void positionHUDChilds();
-        virtual void destroyHUDChilds();
+        void updateWeaponList();
+        void createHUDChilds();
+        void positionHUDChilds();
+        void destroyHUDChilds();
 
         WeakPtr<Pawn> owner_;
 

Modified: code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.h
===================================================================
--- code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.h	2016-01-14 21:27:10 UTC (rev 11063)
+++ code/branches/cpp11_v3/src/modules/pickup/items/MunitionPickup.h	2016-01-14 21:58:46 UTC (rev 11064)
@@ -62,7 +62,7 @@
 
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
 
-            virtual void addMunitionContainer(MunitionContainer* munitionContainer);
+            void addMunitionContainer(MunitionContainer* munitionContainer);
             MunitionContainer* getMunitionContainer(unsigned int index);
 
         private:            

Modified: code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.h	2016-01-14 21:27:10 UTC (rev 11063)
+++ code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.h	2016-01-14 21:58:46 UTC (rev 11064)
@@ -58,8 +58,8 @@
 
             virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
 
-            virtual void setMaxTimeUntilExplosion(float maxTimeUntilExplosion);
-            virtual void setTimeUntilActivation(float timeUntilActivation);
+            void setMaxTimeUntilExplosion(float maxTimeUntilExplosion);
+            void setTimeUntilActivation(float timeUntilActivation);
         protected:
             static const float triggerRadius_;
             static const float damageRadius_;
@@ -83,9 +83,9 @@
             WeakPtr<SphereCollisionShape> collisionShape_; // The collision shape of the projectile.
             WeakPtr<DistanceTrigger> distanceTrigger_;
 
-            virtual void destructionEffect();
-            virtual void allowExplosion();
-            virtual void explode();
+            void destructionEffect();
+            void allowExplosion();
+            void explode();
     };
 }
 

Modified: code/branches/cpp11_v3/src/orxonox/weaponsystem/ReplenishingMunition.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/weaponsystem/ReplenishingMunition.h	2016-01-14 21:27:10 UTC (rev 11063)
+++ code/branches/cpp11_v3/src/orxonox/weaponsystem/ReplenishingMunition.h	2016-01-14 21:58:46 UTC (rev 11064)
@@ -55,7 +55,7 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             
-            virtual float getProgress();
+            float getProgress();
             inline unsigned int getReplenishAmount() const
                 { return replenishAmount_; }
             inline float getReplenishInterval() const