Changeset 10713 for code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h

Timestamp:

Oct 26, 2015, 11:34:23 PM (10 years ago)

Author:

fvultier

Message:

 

File:

• code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified) (4 diffs)

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

@@ -39 +39 @@
 namespace orxonox
 {
-    enum Deployment
+    namespace MunitionDeployment
     {
-        DEPLOYMENT_SHARE,
-        DEPLOYMENT_STACK,
-        DEPLOYMENT_SEPARATE
-    };
-
+        enum Value
+        {
+            Share,
+            Stack,
+            Separate
+        };
+    }
 
     class _OrxonoxExport Munition : public BaseObject
@@ -77 +79 @@
                 { return this->maxMunitionPerMagazine_; }
             inline bool getUseSeparateMagazines() const
-                { return deployment_ == DEPLOYMENT_SEPARATE; }
+                { return deployment_ == MunitionDeployment::Separate; }
             inline bool getStackMunition() const
-                { return deployment_ == DEPLOYMENT_STACK; }
+                { return deployment_ == MunitionDeployment::Stack; }
 
             bool canTakeMunition(unsigned int amount, WeaponMode* user) const;
@@ -105 +107 @@
             unsigned int maxMagazines_;
             unsigned int magazines_;
-            std::map<WeaponMode*, Magazine*> currentMagazines_;
+            std::map<WeaponMode*, Magazine*> currentMagazines_; // Maps weapon modes to magazines that are currently used.
 
-            Deployment deployment_;
+            MunitionDeployment::Value deployment_; // Defines the behaviour how munition and magazines are distributed to the consuming weapon modes.
 
             bool bAllowMunitionRefilling_;
@@ -113 +115 @@
 
             float reloadTime_;
+            WeaponMode* lastFilledWeaponMode_; // Pointer to the weapon mode that got the last munition during the last call of addMunition.
 
         private: