Changeset 10724 for code/branches/fabienHS15/src/orxonox/weaponsystem

Timestamp:

Oct 30, 2015, 7:51:49 PM (9 years ago)

Author:

fvultier

Message:

The weapon system HUD rescales properly if the window size changes.

Location:

code/branches/fabienHS15/src/orxonox/weaponsystem

Files:

• Munition.cc (modified) (1 diff)
• Munition.h (modified) (1 diff)

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

@@ -351 +351 @@
 
                 // If there was no change in a loop, all magazines are full (or locked due to loading)
-                // Because the first loop does not stat at the beginning of the map we have to treat is separately
+                // Because the first loop does not start at the beginning of the map we have to treat is separately
                 if (!change && !firstLoop)
                 {

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

@@ -78 +78 @@
             inline unsigned int getMaxMunitionPerMagazine() const
                 { return this->maxMunitionPerMagazine_; }
-            inline bool getUseSeparateMagazines() const
-                { return deployment_ == MunitionDeployment::Separate; }
-            inline bool getStackMunition() const
-                { return deployment_ == MunitionDeployment::Stack; }
+            inline MunitionDeployment::Value getMunitionDeployment() const
+                { return deployment_; }
+
 
             bool canTakeMunition(unsigned int amount, WeaponMode* user) const;