Changeset 10791 for code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.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/ReplenishingMunition.cc (modified) (5 diffs)

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

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "core/command/Executor.h"
+#include "core/XMLPort.h"
 
 namespace orxonox
@@ -46 +47 @@
 
         this->replenishInterval_ = 1.0f;
-        this->replenishMunitionAmount_ = 1;
+        this->replenishAmount_ = 1;
 
         // Use the timer to initialize itself after the first tick (because the real values for
@@ -53 +54 @@
         this->replenishingTimer_.setTimer(0.0f, false, createExecutor(createFunctor(&ReplenishingMunition::initializeTimer, this)));
     }
+
+    void ReplenishingMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(ReplenishingMunition, XMLPort, xmlelement, mode);
+
+        XMLPortParam(ReplenishingMunition, "replenishamount", setReplenishAmount, getReplenishAmount, xmlelement, mode);
+        XMLPortParam(ReplenishingMunition, "replenishinterval", setReplenishInterval, getReplenishInterval, xmlelement, mode);
+    }    
 
     float ReplenishingMunition::getProgress()
@@ -67 +76 @@
     void ReplenishingMunition::replenish()
     {
-        if (this->canAddMunition(this->replenishMunitionAmount_))
+        if (this->canAddMunition(this->replenishAmount_))
         {
             // Make a temporary copy of bAllowMunitionRefilling_, because this might be disallowed in every
@@ -75 +84 @@
 
             // Replenish munition
-            this->addMunition(this->replenishMunitionAmount_);
+            this->addMunition(this->replenishAmount_);
 
             // Write back the temporary value