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

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/munitions/FusionMunition.cc (modified) (2 diffs)
• src/modules/weapons/munitions/FusionMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/GravityBombMunition.cc (modified) (2 diffs)
• src/modules/weapons/munitions/GravityBombMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/IceMunition.cc (modified) (2 diffs)
• src/modules/weapons/munitions/IceMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/LaserMunition.cc (modified) (2 diffs)
• src/modules/weapons/munitions/LaserMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/LightningMunition.cc (modified) (2 diffs)
• src/modules/weapons/munitions/LightningMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/MineMunition.cc (modified) (1 diff)
• src/modules/weapons/munitions/MineMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/RocketMunition.cc (modified) (2 diffs)
• src/modules/weapons/munitions/RocketMunition.h (modified) (1 diff)
• src/modules/weapons/munitions/SplitMunition.cc (modified) (2 diffs)
• src/modules/weapons/munitions/SplitMunition.h (modified) (1 diff)

code/trunk/src/modules/weapons/munitions/FusionMunition.cc

@@ -34 +34 @@
 #include "FusionMunition.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 
 namespace orxonox
@@ -57 +56 @@
         this->reloadTime_ = 0.5f;
     }
-
-    void FusionMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(FusionMunition, XMLPort, xmlelement, mode);
-    }
 }

code/trunk/src/modules/weapons/munitions/FusionMunition.h

@@ -52 +52 @@
         public:
             FusionMunition(Context* context);
-            virtual ~FusionMunition() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual ~FusionMunition() = default;
     };
 }

code/trunk/src/modules/weapons/munitions/GravityBombMunition.cc

@@ -7 +7 @@
 #include "GravityBombMunition.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 
 namespace orxonox
@@ -27 +26 @@
         this->reloadTime_ = 0.0f;
     }
-
-    void GravityBombMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(GravityBombMunition, XMLPort, xmlelement, mode);
-    }
 }
 

code/trunk/src/modules/weapons/munitions/GravityBombMunition.h

@@ -27 +27 @@
         public:
             GravityBombMunition(Context* context);
-            virtual ~GravityBombMunition() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual ~GravityBombMunition() = default;
     };
 

code/trunk/src/modules/weapons/munitions/IceMunition.cc

@@ -34 +34 @@
 #include "IceMunition.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 
 namespace orxonox
@@ -55 +54 @@
         this->reloadTime_ = 0.5f;
     }
-
-    void IceMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(IceMunition, XMLPort, xmlelement, mode);
-    }
 }

code/trunk/src/modules/weapons/munitions/IceMunition.h

@@ -52 +52 @@
         public:
             IceMunition(Context* context);
-            virtual ~IceMunition() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual ~IceMunition() = default;
     };
 }

code/trunk/src/modules/weapons/munitions/LaserMunition.cc

@@ -34 +34 @@
 #include "LaserMunition.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 
 namespace orxonox
@@ -58 +57 @@
         this->reloadTime_ = 0.5f;
     }
-
-    void LaserMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(LaserMunition, XMLPort, xmlelement, mode);
-    }
 }

code/trunk/src/modules/weapons/munitions/LaserMunition.h

@@ -52 +52 @@
         public:
             LaserMunition(Context* context);
-            virtual ~LaserMunition() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual ~LaserMunition() = default;
     };
 }

code/trunk/src/modules/weapons/munitions/LightningMunition.cc

@@ -34 +34 @@
 #include "LightningMunition.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 
 namespace orxonox
@@ -55 +54 @@
         this->reloadTime_ = 0.5f;    
     }
-
-    void LightningMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(LightningMunition, XMLPort, xmlelement, mode);
-    }
 }

code/trunk/src/modules/weapons/munitions/LightningMunition.h

@@ -52 +52 @@
         public:
             LightningMunition(Context* context);
-            virtual ~LightningMunition() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual ~LightningMunition() = default;
     };
 }

code/trunk/src/modules/weapons/munitions/MineMunition.cc

@@ -54 +54 @@
         this->reloadTime_ = 0.5f;
     }
-
-    void MineMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(MineMunition, XMLPort, xmlelement, mode);
-    }
 }

code/trunk/src/modules/weapons/munitions/MineMunition.h

@@ -52 +52 @@
         public:
             MineMunition(Context* context);
-            virtual ~MineMunition() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual ~MineMunition() = default;
     };
 }

code/trunk/src/modules/weapons/munitions/RocketMunition.cc

@@ -34 +34 @@
 #include "RocketMunition.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 
 namespace orxonox
@@ -55 +54 @@
         this->reloadTime_ = 0.5f;
     }
-
-    void RocketMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(RocketMunition, XMLPort, xmlelement, mode);
-    }
 }

code/trunk/src/modules/weapons/munitions/RocketMunition.h

@@ -52 +52 @@
         public:
             RocketMunition(Context* context);
-            virtual ~RocketMunition() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual ~RocketMunition() = default;
     };
 }

code/trunk/src/modules/weapons/munitions/SplitMunition.cc

@@ -34 +34 @@
 #include "SplitMunition.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 
 namespace orxonox
@@ -55 +54 @@
         this->reloadTime_ = 0.5f;
     }
-
-    void SplitMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(SplitMunition, XMLPort, xmlelement, mode);
-    }
 }

code/trunk/src/modules/weapons/munitions/SplitMunition.h

@@ -52 +52 @@
         public:
             SplitMunition(Context* context);
-            virtual ~SplitMunition() {}
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual ~SplitMunition() = default;
     };
 }