Index: code/branches/fabienHS15/src/modules/weapons/weaponmodes/EnergyDrink.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/EnergyDrink.cc	(revision 10685)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/EnergyDrink.cc	(revision 10688)
@@ -63,4 +63,6 @@
         this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&EnergyDrink::shot, this)));
         this->delayTimer_.stopTimer();
+
+        hudImageString_ = "Orxonox/WSHUD_WM_EnergyDrink";
     }
 
Index: code/branches/fabienHS15/src/modules/weapons/weaponmodes/FusionFire.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/FusionFire.cc	(revision 10685)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/FusionFire.cc	(revision 10688)
@@ -58,4 +58,6 @@
 
         this->setMunitionName("FusionMunition");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_FusionFire";
     }
 
Index: code/branches/fabienHS15/src/modules/weapons/weaponmodes/GravityBombFire.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/GravityBombFire.cc	(revision 10685)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/GravityBombFire.cc	(revision 10688)
@@ -31,4 +31,6 @@
         this->setMunitionName("GravityBombMunition");
         this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.8);    ///< sets sound of the bomb as it is fired.
+
+        hudImageString_ = "Orxonox/WSHUD_WM_GravityBombFire";
     }
 
Index: code/branches/fabienHS15/src/modules/weapons/weaponmodes/HsW01.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/HsW01.cc	(revision 10685)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/HsW01.cc	(revision 10688)
@@ -69,4 +69,6 @@
 
         this->setDefaultSound(this->sound_);
+
+        hudImageString_ = "Orxonox/WSHUD_WM_HsW01";
     }
 
Index: code/branches/fabienHS15/src/modules/weapons/weaponmodes/IceGun.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/IceGun.cc	(revision 10685)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/IceGun.cc	(revision 10688)
@@ -59,6 +59,8 @@
         this->setFreezeFactor(0.5);
 
-        this->setMunitionName("LaserMunition");
+        this->setMunitionName("IceMunition");
         this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_IceGun";
     }
 
Index: code/branches/fabienHS15/src/modules/weapons/weaponmodes/LaserFire.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/LaserFire.cc	(revision 10685)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/LaserFire.cc	(revision 10688)
@@ -56,4 +56,6 @@
 
         this->setMunitionName("LaserMunition");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_LaserFire";
     }
 
Index: code/branches/fabienHS15/src/modules/weapons/weaponmodes/LightningGun.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/LightningGun.cc	(revision 10685)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/LightningGun.cc	(revision 10688)
@@ -54,6 +54,8 @@
         this->speed_ = 750.0f;
 
-        this->setMunitionName("LaserMunition");
+        this->setMunitionName("LightningMunition");
         this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_LightningGun";
     }
 
Index: code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc	(revision 10685)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc	(revision 10688)
@@ -59,4 +59,6 @@
         this->setMunitionName("RocketMunition");
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
+
+        hudImageString_ = "Orxonox/WSHUD_WM_RocketFire";
     }
 
Index: code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFireOld.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFireOld.cc	(revision 10685)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFireOld.cc	(revision 10688)
@@ -59,4 +59,6 @@
         this->setMunitionName("RocketMunition");
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
+
+        hudImageString_ = "Orxonox/WSHUD_WM_SimpleRocketFire";
     }
 
Index: code/branches/fabienHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	(revision 10685)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	(revision 10688)
@@ -64,4 +64,6 @@
         this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4f);
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
+
+        hudImageString_ = "Orxonox/WSHUD_WM_SimpleRocketFire";
     }
 
@@ -89,5 +91,6 @@
 
         WorldEntity* pawn = static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();
-        if (pawn) controller->setTarget(pawn);
+        if (pawn)
+            controller->setTarget(pawn);
     }
 }
Index: code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc
===================================================================
--- code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc	(revision 10685)
+++ code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc	(revision 10688)
@@ -62,4 +62,6 @@
         this->setMunitionName("SplitMunition");
         this->setDefaultSound("sounds/Weapon_LightningGun.ogg");
+
+        hudImageString_ = "Orxonox/WSHUD_WM_SplitGun";
     }
 
