Changeset 10963 for code/branches/presentationHS15/src/modules/weapons/munitions

Timestamp:

Dec 9, 2015, 4:56:39 PM (9 years ago)

Author:

maxima

Message:

Merged presentation and particleEffects branches. Added a new level, spaceshiptemplate and weaponsettings for the mine.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• src/modules/weapons/munitions/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/munitions/MineMunition.cc (copied) (copied from code/branches/particleEffectsHS15/src/modules/weapons/munitions/MineMunition.cc) (1 diff)
• src/modules/weapons/munitions/MineMunition.h (copied) (copied from code/branches/particleEffectsHS15/src/modules/weapons/munitions/MineMunition.h) (1 diff)

code/branches/presentationHS15/src/modules/weapons/munitions/CMakeLists.txt

@@ -7 +7 @@
   IceMunition.cc
   SplitMunition.cc
+  MineMunition.cc
 )

code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.cc

@@ -45 +45 @@
         this->maxMunitionPerMagazine_ = 1;
         this->maxMagazines_ = 100;
-        this->magazines_ = 25;
+        this->unassignedMagazines_ = 25;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = MunitionDeployment::Stack;
 
         this->bAllowMunitionRefilling_ = true;
         this->bAllowMultiMunitionRemovementUnderflow_ = false;
+
+        this->reloadTime_ = 0.5f;
+    }
+
+    void MineMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(MineMunition, XMLPort, xmlelement, mode);
     }
 }

code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.h

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