Index: trunk/src/world_entities/weapons/acid_launcher.cc
===================================================================
--- trunk/src/world_entities/weapons/acid_launcher.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/acid_launcher.cc	(revision 10415)
@@ -101,7 +101,7 @@
   this->getProjectileFactory()->prepare(10);
 
-  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
-  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/vocals/missiles.wav");
+  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
 
 }
Index: trunk/src/world_entities/weapons/aiming_turret.cc
===================================================================
--- trunk/src/world_entities/weapons/aiming_turret.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/aiming_turret.cc	(revision 10415)
@@ -98,7 +98,7 @@
   this->target.setAngle(M_PI_2);
 
-  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_3.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/voices/rockets.wav");
-  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
+  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
 
 }
Index: trunk/src/world_entities/weapons/boomerang_gun.cc
===================================================================
--- trunk/src/world_entities/weapons/boomerang_gun.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/boomerang_gun.cc	(revision 10415)
@@ -94,7 +94,7 @@
   //this->getProjectileFactory()->prepare(100);
 
-  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_3.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
-  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/vocals/missiles.wav");
+  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
 
 }
Index: trunk/src/world_entities/weapons/cannon.cc
===================================================================
--- trunk/src/world_entities/weapons/cannon.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/cannon.cc	(revision 10415)
@@ -85,6 +85,6 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/explo.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/voices/cannon.wav");
+  this->setActionSound(WA_SHOOT, "sounds/explo.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/voices/cannon.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_HEAVY);
Index: trunk/src/world_entities/weapons/heavy_blaster.cc
===================================================================
--- trunk/src/world_entities/weapons/heavy_blaster.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/heavy_blaster.cc	(revision 10415)
@@ -41,5 +41,5 @@
   }
   delete [] this->emissionPoint;
-  
+
    delete [] this->shootAnim;
    delete [] this->objComp;
@@ -73,5 +73,5 @@
 
   this->loadModel("models/guns/fragcannon.obj", .4);
-  
+
 
   this->setStateDuration(WS_SHOOTING, 0.5);   // 2 Schuss pro Sekunde
@@ -84,7 +84,7 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
-  this->setActionSound(WA_RELOAD, "sound/spawn/alien_generator.wav");
+  this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
+  this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
Index: trunk/src/world_entities/weapons/hyperblaster.cc
===================================================================
--- trunk/src/world_entities/weapons/hyperblaster.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/hyperblaster.cc	(revision 10415)
@@ -72,7 +72,7 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_4.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/powerups/whats this2.wav");
-  this->setActionSound(WA_RELOAD, "sound/spawn/alien_generator.wav");
+  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_4.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/powerups/whats this2.wav");
+  this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_HEAVY);
Index: trunk/src/world_entities/weapons/laser_cannon.cc
===================================================================
--- trunk/src/world_entities/weapons/laser_cannon.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/laser_cannon.cc	(revision 10415)
@@ -68,6 +68,6 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
+  this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
 
 
Index: trunk/src/world_entities/weapons/light_blaster.cc
===================================================================
--- trunk/src/world_entities/weapons/light_blaster.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/light_blaster.cc	(revision 10415)
@@ -67,5 +67,5 @@
 
   this->loadModel("models/guns/gattling.obj", 0.333);
-  
+
 
   this->setStateDuration(WS_SHOOTING, 0.05);  // 20 Schuss pro Sekunde
@@ -78,7 +78,7 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
-  this->setActionSound(WA_RELOAD, "sound/spawn/alien_generator.wav");
+  this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
+  this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
Index: trunk/src/world_entities/weapons/medium_blaster.cc
===================================================================
--- trunk/src/world_entities/weapons/medium_blaster.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/medium_blaster.cc	(revision 10415)
@@ -63,7 +63,7 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
-  this->setActionSound(WA_RELOAD, "sound/spawn/alien_generator.wav");
+  this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
+  this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
Index: trunk/src/world_entities/weapons/spike_launcher.cc
===================================================================
--- trunk/src/world_entities/weapons/spike_launcher.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/spike_launcher.cc	(revision 10415)
@@ -110,7 +110,7 @@
   this->getProjectileFactory()->prepare(this->spikes);  //we don't need more...
 
-//   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
-//   this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
-//   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+//   this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
+//   this->setActionSound(WA_ACTIVATE, "sounds/vocals/missiles.wav");
+//   this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
 
 }
Index: trunk/src/world_entities/weapons/spike_thrower.cc
===================================================================
--- trunk/src/world_entities/weapons/spike_thrower.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/spike_thrower.cc	(revision 10415)
@@ -104,7 +104,7 @@
   this->getProjectileFactory()->prepare(50);
 
-  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
-  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/vocals/missiles.wav");
+  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
 
 }
Index: trunk/src/world_entities/weapons/swarm_launcher.cc
===================================================================
--- trunk/src/world_entities/weapons/swarm_launcher.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/swarm_launcher.cc	(revision 10415)
@@ -102,7 +102,7 @@
   this->getProjectileFactory()->prepare(50);
 
-  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
-  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/vocals/missiles.wav");
+  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
 
 }
Index: trunk/src/world_entities/weapons/targeting_turret.cc
===================================================================
--- trunk/src/world_entities/weapons/targeting_turret.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/targeting_turret.cc	(revision 10415)
@@ -92,7 +92,7 @@
 
 
-  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_3.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/voices/rockets.wav");
-  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
+  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
 }
 
Index: trunk/src/world_entities/weapons/test_gun.cc
===================================================================
--- trunk/src/world_entities/weapons/test_gun.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/test_gun.cc	(revision 10415)
@@ -124,6 +124,6 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
+  this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
 
 
Index: trunk/src/world_entities/weapons/turret.cc
===================================================================
--- trunk/src/world_entities/weapons/turret.cc	(revision 10368)
+++ trunk/src/world_entities/weapons/turret.cc	(revision 10415)
@@ -93,7 +93,7 @@
   //this->getProjectileFactory()->prepare(100);
 
-  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_3.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
-  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
+  this->setActionSound(WA_ACTIVATE, "sounds/vocals/missiles.wav");
+  this->setActionSound(WA_RELOAD, "sounds/vocals/reload.wav");
 
 }
