Changeset 11071 for code/trunk/src/modules/weapons/weaponmodes

Timestamp:

Jan 17, 2016, 10:29:21 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/weapons/weaponmodes/EnergyDrink.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/FusionFire.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/GravityBombFire.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/HsW01.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/IceGun.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/LaserFire.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/LightningGun.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/MineGun.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFire.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFireOld.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/SplitGun.h (modified) (1 diff)

code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h

@@ -57 +57 @@
             virtual ~EnergyDrink() {}
 
-            virtual void fire();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void fire() override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         private:

code/trunk/src/modules/weapons/weaponmodes/FusionFire.h

@@ -54 +54 @@
             virtual ~FusionFire() {}
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:

code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.h

@@ -34 +34 @@
             virtual ~GravityBombFire();
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:

code/trunk/src/modules/weapons/weaponmodes/HsW01.h

@@ -56 +56 @@
             virtual ~HsW01();
 
-            virtual void fire();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void fire() override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         protected:

code/trunk/src/modules/weapons/weaponmodes/IceGun.h

@@ -54 +54 @@
             virtual ~IceGun();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void fire();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void fire() override;
             
             inline void setFreezeTime(float freezeTime)

code/trunk/src/modules/weapons/weaponmodes/LaserFire.h

@@ -54 +54 @@
             virtual ~LaserFire() {}
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:

code/trunk/src/modules/weapons/weaponmodes/LightningGun.h

@@ -54 +54 @@
             virtual ~LightningGun();
 
-            virtual void fire();
+            virtual void fire() override;
 
        private:

code/trunk/src/modules/weapons/weaponmodes/MineGun.h

@@ -59 +59 @@
             virtual ~MineGun();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void fire();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void fire() override;
 
             inline float getMaxTimeUntilExplosion() const

code/trunk/src/modules/weapons/weaponmodes/RocketFire.h

@@ -54 +54 @@
             virtual ~RocketFire();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void fire();
+            virtual void fire() override;
             inline void setFuel(float fuel)
                 { this->fuel_ = fuel; }

code/trunk/src/modules/weapons/weaponmodes/RocketFireOld.h

@@ -54 +54 @@
             virtual ~RocketFireOld();
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:

code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.h

@@ -53 +53 @@
             virtual ~SimpleRocketFire();
             void deactivateFire();
-            virtual void fire();
+            virtual void fire() override;
 
         private:

code/trunk/src/modules/weapons/weaponmodes/SplitGun.h

@@ -54 +54 @@
             virtual ~SplitGun();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void fire();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void fire() override;
 
             inline void setNumberOfSplits(int numberOfSplits)