Changeset 10791 for code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc

Timestamp:

Nov 9, 2015, 5:55:42 PM (9 years ago)

Author:

fvultier

Message:

Munition may and must now be defined for each pawn separately. This way a heavy cruiser may carry more munition than a drone.

File:

• code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) (10 diffs)

code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc

@@ -24 +24 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Fabien Vultier
  *
  */
@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "core/command/Executor.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -58 +59 @@
         for (std::map<WeaponMode*, Magazine*>::iterator it = this->currentMagazines_.begin(); it != this->currentMagazines_.end(); ++it)
             delete it->second;
+    }
+
+    void Munition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(Munition, XMLPort, xmlelement, mode);
+
+        XMLPortParam(Munition, "initialmagazines", setNumMagazines, getNumMagazines, xmlelement, mode);
+        XMLPortParam(Munition, "maxmagazines", setMaxMagazines, getMaxMagazines, xmlelement, mode);
+        XMLPortParam(Munition, "munitionpermagazine", setMaxMunitionPerMagazine, getMaxMunitionPerMagazine, xmlelement, mode);
     }
 
@@ -121 +131 @@
     }
 
+    void Munition::setNumMagazines(unsigned int numMagazines)
+    {
+        this->magazines_ = numMagazines;
+    }
+
     unsigned int Munition::getMaxMunition() const
     {
@@ -138 +153 @@
             // If we stack munition, we don't care about the current magazine - we just need enough munition in total
             if (deployment_ == MunitionDeployment::Stack)
+            {
                 munition += this->maxMunitionPerMagazine_ * this->magazines_;
+            }
 
             if (munition == 0)
+            {
                 // Absolutely no munition - no chance to take munition
                 return false;
+            }
             else if (this->bAllowMultiMunitionRemovementUnderflow_)
+            {
                 // We're not empty AND we allow underflow, so this will always work
                 return true;
+            }
             else
+            {
                 // We don't allow underflow, so we have to check the amount
                 return (munition >= amount);
+            }
+
         }
         return false;
@@ -200 +224 @@
     {
         // As long as we have enough magazines (and don't stack munition) we can reload
-        return (this->magazines_ > 0 && !deployment_ == MunitionDeployment::Stack);
+        return (this->magazines_ > 0 && deployment_ != MunitionDeployment::Stack);
     }
 
@@ -236 +260 @@
 
         // If we don't use separate magazines, set user to 0
-        if (!deployment_ == MunitionDeployment::Separate)
-            user = 0;
+        if (deployment_ != MunitionDeployment::Separate)
+        {
+            user = NULL;
+        }
 
         // Remove the current magazine for the given user
@@ -289 +315 @@
         {
             // Stacking munition means, if a magazine gets full, the munition adds to a new magazine
-            Magazine* magazine = this->getMagazine(0);
+            Magazine* magazine = this->getMagazine(NULL);
             if (magazine)
             {
@@ -386 +412 @@
 
         // If zero or less magazines are needed, we definitively don't need more magazines (unless we stack munition - then a magazine contributes directly to the munition)
-        if (needed_magazines <= 0 && !deployment_ == MunitionDeployment::Stack)
+        if (needed_magazines <= 0 && deployment_ != MunitionDeployment::Stack)
             return false;
 
@@ -470 +496 @@
 
         // If we don't use separate magazines, set user to 0
-        if (!deployment_ == MunitionDeployment::Separate)
-            user = 0;
+        if (deployment_ != MunitionDeployment::Separate)
+            user = NULL;
 
         // Remove the current magazine for the given user