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

Timestamp:

Oct 24, 2015, 10:51:18 PM (10 years ago)

Author:

fvultier

Message:

There is now a HUD that shows the status of the weapon system: all weapons, weapon modes and their munition. Progress bars show the progress of replenishing munition.

File:

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

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

@@ -39 +39 @@
 namespace orxonox
 {
+    enum Deployment
+    {
+        DEPLOYMENT_SHARE,
+        DEPLOYMENT_STACK,
+        DEPLOYMENT_SEPARATE
+    };
+
+
     class _OrxonoxExport Munition : public BaseObject
-    {
+    {        
         struct Magazine
         {
@@ -68 +76 @@
             inline unsigned int getMaxMunitionPerMagazine() const
                 { return this->maxMunitionPerMagazine_; }
+            inline bool getUseSeparateMagazines() const
+                { return deployment_ == DEPLOYMENT_SEPARATE; }
+            inline bool getStackMunition() const
+                { return deployment_ == DEPLOYMENT_STACK; }
 
             bool canTakeMunition(unsigned int amount, WeaponMode* user) const;
@@ -95 +107 @@
             std::map<WeaponMode*, Magazine*> currentMagazines_;
 
-            bool bUseSeparateMagazines_;
-            bool bStackMunition_;
+            Deployment deployment_;
+
             bool bAllowMunitionRefilling_;
             bool bAllowMultiMunitionRemovementUnderflow_;