Index: code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc
===================================================================
--- code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc	(revision 10721)
+++ code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc	(revision 10724)
@@ -29,10 +29,6 @@
 #include "HUDWeapon.h"
 
-#include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h>
-
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "tools/TextureGenerator.h"
 #include "util/Convert.h"
 #include "core/class/Super.h"
@@ -186,5 +182,4 @@
             (*it)->setWeaponIndex(this->weaponIndex_);
             (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
-            (*it)->positionHUDChilds();
 
             ++ positionIndex;
Index: code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h
===================================================================
--- code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h	(revision 10721)
+++ code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h	(revision 10724)
@@ -37,11 +37,7 @@
 
 #include <OgreOverlayManager.h>
-#include <OgreMaterialManager.h>
-#include <OgreTechnique.h>
-#include <OgrePass.h>
 #include <OgrePanelOverlayElement.h> 
 
 #include "overlays/OrxonoxOverlay.h"
-#include "overlays/OverlayText.h"
 #include "tools/interfaces/Tickable.h"
 #include "worldentities/pawns/Pawn.h"
@@ -79,11 +75,9 @@
             { weaponIndex_ = index;
               this->updatePosition();
-            }
-
-        virtual void positionHUDChilds();
+            }        
 
     private:
         virtual void createHUDChilds();
-        
+        virtual void positionHUDChilds();
         virtual void destroyHUDChilds();
         virtual void updateWeaponModeList();
Index: code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc
===================================================================
--- code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc	(revision 10721)
+++ code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc	(revision 10724)
@@ -21,23 +21,16 @@
  *
  *   Author:
- *      Yuning Chai
- *      Felix Schulthess
+ *      Fabien Vultier
  *   Co-authors:
- *      Reto Grieder
- *      Wolfgang Roenninger
+ *      ...
  *
  */
 
 #include "HUDWeaponMode.h"
-
-#include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h>
 
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "tools/TextureGenerator.h"
-#include "weaponsystem/WeaponMode.h"
-#include "weaponsystem/Munition.h"
 #include "util/Convert.h"
+#include "core/class/Super.h"
 
 namespace orxonox
@@ -87,4 +80,5 @@
         textOverlayLeft_->setColour(ColourValue(0.21,0.70,0.21,1.0));
         textOverlayLeft_->setAspectCorrection(false);
+        textOverlayLeft_->setZOrder(600);
         
         this->textOverlayRight_ = new OverlayText(this->getContext());
@@ -97,4 +91,5 @@
         textOverlayRight_->setColour(ColourValue(0.21,0.70,0.21,1.0));
         textOverlayRight_->setAspectCorrection(false);
+        textOverlayRight_->setZOrder(600);
 
         materialNameState_ = "Orxonox/WSHUD_Reloading";
@@ -137,18 +132,17 @@
             if (munition != NULL)
             {
-                bool useSeparateMagazines = munition->getUseSeparateMagazines();
-                bool stackMunition = munition->getStackMunition();
-
-                if (!useSeparateMagazines && !stackMunition)
+                MunitionDeployment::Value deployment = munition->getMunitionDeployment();
+
+                if (deployment == MunitionDeployment::Share)
                 {
                     this->textOverlayLeft_->setCaption(multi_cast<std::string>(munition->getNumMunitionInCurrentMagazine(weaponMode_)));
                     this->textOverlayRight_->setCaption(multi_cast<std::string>(munition->getNumMagazines()));
                 }
-                else if (!useSeparateMagazines && stackMunition)
+                else if (deployment == MunitionDeployment::Stack)
                 {
                     this->textOverlayLeft_->setCaption(multi_cast<std::string>(munition->getNumMunition(weaponMode_)));
                     this->textOverlayRight_->setCaption("");
                 }
-                else if (useSeparateMagazines && !stackMunition)
+                else if (deployment == MunitionDeployment::Separate)
                 {
                     this->textOverlayLeft_->setCaption(multi_cast<std::string>(munition->getNumMunitionInCurrentMagazine(weaponMode_)));
@@ -245,16 +239,15 @@
         if (munition != NULL)
         {
-            bool useSeparateMagazines = munition->getUseSeparateMagazines();
-            bool stackMunition = munition->getStackMunition();
-
-            if (!useSeparateMagazines && !stackMunition)
+            MunitionDeployment::Value deployment = munition->getMunitionDeployment();
+
+            if (deployment == MunitionDeployment::Share)
             {
                 overlayElementMunition_->setMaterialName("Orxonox/WSHUD_MunitionShare");
             }
-            else if (!useSeparateMagazines && stackMunition)
+            else if (deployment == MunitionDeployment::Stack)
             {
                 overlayElementMunition_->setMaterialName("Orxonox/WSHUD_MunitionStack");
             }
-            else if (useSeparateMagazines && !stackMunition)
+            else if (deployment == MunitionDeployment::Separate)
             {
                 overlayElementMunition_->setMaterialName("Orxonox/WSHUD_MunitionSeparate");
Index: code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h
===================================================================
--- code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h	(revision 10721)
+++ code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h	(revision 10724)
@@ -38,7 +38,4 @@
 
 #include <OgreOverlayManager.h>
-#include <OgreMaterialManager.h>
-#include <OgreTechnique.h>
-#include <OgrePass.h>
 #include <OgrePanelOverlayElement.h> 
 
@@ -49,4 +46,6 @@
 #include "overlays/OverlayGroup.h"
 #include "weaponsystem/ReplenishingMunition.h"
+#include "weaponsystem/WeaponMode.h"
+#include "weaponsystem/Munition.h"
 
 namespace orxonox
@@ -84,9 +83,8 @@
             }
 
-        virtual void positionHUDChilds();
-
     private:
         virtual void updateSize();
         virtual void updatePosition();
+        virtual void positionHUDChilds();
 
         WeakPtr<Pawn> owner_;
Index: code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc
===================================================================
--- code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc	(revision 10721)
+++ code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc	(revision 10724)
@@ -21,9 +21,7 @@
  *
  *   Author:
- *      Yuning Chai
- *      Felix Schulthess
+ *      Fabien Vultier
  *   Co-authors:
- *      Reto Grieder
- *      Wolfgang Roenninger
+ *      ...
  *
  */
@@ -31,10 +29,6 @@
 #include "HUDWeaponSystem.h"
 
-#include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h>
-
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "tools/TextureGenerator.h"
 #include "weaponsystem/WeaponSystem.h"
 #include "weaponsystem/WeaponPack.h"
@@ -73,14 +67,4 @@
     }
 
-    void HUDWeaponSystem::tick(float dt)
-    {
-        SUPER(HUDWeaponSystem, tick, dt);
-
-        if (this->owner_)
-        {
-
-        }
-    }  
-
     void HUDWeaponSystem::positionChanged()
     {
@@ -111,6 +95,4 @@
     {
         SUPER(HUDWeaponSystem, changedOverlayGroup);
-
-        //this->getOverlayGroup()->addElement(this->textOverlay_.get());
     }   
 
@@ -118,6 +100,4 @@
     {
         SUPER(HUDWeaponSystem, changedVisibility);
-
-        //this->textOverlay_->setVisible(this->isVisible());
     }
 
@@ -125,6 +105,4 @@
     {
         SUPER(HUDWeaponSystem, changedName);
-
-        //this->textOverlay_->setName(this->getName() + "text");
     }  
 
@@ -178,6 +156,4 @@
     {
         int positionIndex = 0;
-        //this->setSize(weaponModeHUDSize_);
-        // this->weaponModeHUDActualSize_ = this->getActualSize();
 
         for (std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)
@@ -185,5 +161,4 @@
             (*it)->setWeaponIndex(positionIndex);
             (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
-            (*it)->positionHUDChilds();           
 
             ++ positionIndex;
Index: code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h
===================================================================
--- code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h	(revision 10721)
+++ code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h	(revision 10724)
@@ -36,13 +36,5 @@
 #include <string>
 
-#include <OgreOverlayManager.h>
-#include <OgreMaterialManager.h>
-#include <OgreTechnique.h>
-#include <OgrePass.h>
-#include <OgrePanelOverlayElement.h> 
-
 #include "overlays/OrxonoxOverlay.h"
-#include "overlays/OverlayText.h"
-#include "tools/interfaces/Tickable.h"
 #include "worldentities/pawns/Pawn.h"
 #include "overlays/OverlayGroup.h"
@@ -51,5 +43,5 @@
 namespace orxonox
 {
-    class _OverlaysExport HUDWeaponSystem : public OrxonoxOverlay, public Tickable
+    class _OverlaysExport HUDWeaponSystem : public OrxonoxOverlay
     {
     public:
@@ -58,5 +50,4 @@
 
         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-        virtual void tick(float dt);
         virtual void changedOwner();
         virtual void changedOverlayGroup();
