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

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.

File:

• code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified) (1 diff)

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;