Index: /branches/playability/src/world_entities/space_ships/space_ship.cc
===================================================================
--- /branches/playability/src/world_entities/space_ships/space_ship.cc	(revision 10120)
+++ /branches/playability/src/world_entities/space_ships/space_ship.cc	(revision 10121)
@@ -144,5 +144,5 @@
   this->registerObject(this, SpaceShip::_objectList);
   PRINTF(4)("SPACESHIP INIT\n");
-
+  this->weaponMan.setParentEntity( this);
   //weapons:
   
@@ -175,22 +175,13 @@
   this->weaponMan.addWeapon( wpLeft1, 0, 0);
   this->weaponMan.addWeapon( wpRight1, 0, 1);
-  this->weaponMan.addWeapon( wpLeft2, 1, 0);
-  this->weaponMan.addWeapon( wpRight2, 1, 1);
-  this->weaponMan.addWeapon( wpLeft3, 2, 0);
-  this->weaponMan.addWeapon( wpRight3, 2, 1);
+
+  this->weaponMan.addWeapon( wpLeft2, 1, 2);
+  this->weaponMan.addWeapon( wpRight2, 1, 3);
+
+  this->weaponMan.addWeapon( wpLeft3, 2, 4);
+  this->weaponMan.addWeapon( wpRight3, 2, 5);
 
   this->secWeaponMan.addWeapon( cannon, 0, 0);
 
-/*
-  wpRight1->requestAction(WA_ACTIVATE);
-  wpLeft1->requestAction(WA_ACTIVATE);
-
-  wpRight2->requestAction(WA_ACTIVATE);
-  wpLeft2->requestAction(WA_ACTIVATE);
-  wpRight3->requestAction(WA_ACTIVATE);
-  wpLeft3->requestAction(WA_ACTIVATE);
-
-  cannon->requestAction(WA_ACTIVATE);
-*/
   
   this->weaponMan.changeWeaponConfig(1);
Index: /branches/playability/src/world_entities/weapons/medium_blaster.cc
===================================================================
--- /branches/playability/src/world_entities/weapons/medium_blaster.cc	(revision 10120)
+++ /branches/playability/src/world_entities/weapons/medium_blaster.cc	(revision 10121)
@@ -56,6 +56,6 @@
 
   this->setStateDuration(WS_RELOADING, 0);
-  this->setStateDuration(WS_ACTIVATING, .5);
-  this->setStateDuration(WS_DEACTIVATING, 1);
+  this->setStateDuration(WS_ACTIVATING, 0); //.5);
+  this->setStateDuration(WS_DEACTIVATING, 0); // 1);
 
   this->setEnergyMax(500);
Index: /branches/playability/src/world_entities/weapons/weapon.cc
===================================================================
--- /branches/playability/src/world_entities/weapons/weapon.cc	(revision 10120)
+++ /branches/playability/src/world_entities/weapons/weapon.cc	(revision 10121)
@@ -353,6 +353,6 @@
   {
     /** Disabled for releaseFire() from WM*/
-    //if (this->requestedAction != WA_NONE)
-    //  return;
+    if (this->requestedAction != WA_NONE)
+      return;
     PRINTF(5)("next action will be %s in %f seconds\n", actionToChar(action), this->stateDuration);
     this->requestedAction = action;
@@ -435,5 +435,5 @@
     break;
     default:
-    PRINTF(2)("Action %s Not Implemented yet \n", Weapon::actionToChar(action));
+    PRINTF(5)("Action %s Not Implemented yet \n", Weapon::actionToChar(action));
     return false;
   }
Index: /branches/playability/src/world_entities/weapons/weapon_manager.cc
===================================================================
--- /branches/playability/src/world_entities/weapons/weapon_manager.cc	(revision 10120)
+++ /branches/playability/src/world_entities/weapons/weapon_manager.cc	(revision 10121)
@@ -420,4 +420,5 @@
   this->currentConfigID = weaponConfig;
   PRINTF(4)("Changing weapon configuration: to %i\n", this->currentConfigID);
+
   for (int i = 0; i < WM_MAX_SLOTS; i++)
     this->currentSlotConfig[i].nextWeapon = this->configs[currentConfigID][i];
@@ -472,7 +473,7 @@
   for(int i = 0; i < this->slotCount; i++)
   {
-/*
-    NICE LITTLE DEBUG FUNCTION
-       if (this->currentSlotConfig[i].currentWeapon != NULL || this->currentSlotConfig[i].nextWeapon != NULL)
+
+    //NICE LITTLE DEBUG FUNCTION
+    /*   if (this->currentSlotConfig[i].currentWeapon != NULL || this->currentSlotConfig[i].nextWeapon != NULL)
       printf("%p %p\n", this->currentSlotConfig[i].currentWeapon, this->currentSlotConfig[i].nextWeapon);*/
 
@@ -496,7 +497,7 @@
         }
       }
-
       // switching to next Weapon
       tickWeapon = this->currentSlotConfig[i].currentWeapon = this->currentSlotConfig[i].nextWeapon;
+      
       if (tickWeapon != NULL)
       {
