Index: /branches/playability/src/world_entities/projectiles/hbolt.cc
===================================================================
--- /branches/playability/src/world_entities/projectiles/hbolt.cc	(revision 10108)
+++ /branches/playability/src/world_entities/projectiles/hbolt.cc	(revision 10109)
@@ -117,9 +117,9 @@
 {
   printf("Collision with HBolt\n");
-  if (this->hitEntity != entity/* && entity->isA(CL_NPC)*/ || entity == this->target)
+  if (this->hitEntity != entity && entity->isA(CL_NPC) || entity == this->target)
     this->destroy( entity );
   this->hitEntity = entity;
   dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
-//   this->deactivate();
+  this->deactivate();
 }
 
Index: /branches/playability/src/world_entities/projectiles/swarm_projectile.cc
===================================================================
--- /branches/playability/src/world_entities/projectiles/swarm_projectile.cc	(revision 10108)
+++ /branches/playability/src/world_entities/projectiles/swarm_projectile.cc	(revision 10109)
@@ -137,5 +137,5 @@
   this->hitEntity = entity;
   dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
-  this->destroy(NULL);
+  this->destroy(this);
 }
 
@@ -243,5 +243,5 @@
   this->lastDir = this->curDir;
   this->curDir = this->velocity;
-  if( (this->getAbsCoor() - this->target->getAbsCoor()).len() < 1)   // FIXME  Temp fake workaround for collision :)
+  if( (this->getAbsCoor() - this->target->getAbsCoor()).len() < 3)   // FIXME  Temp fake workaround for collision :)
   {
     dynamic_cast<WorldEntity*>(target)->destroy( this);
@@ -256,5 +256,5 @@
 {
 
-  printf("THIS SHOULD WORK!\n");
+//   printf("THIS SHOULD WORK!\n");
 
   Projectile::destroy( killer );
Index: /branches/playability/src/world_entities/space_ships/space_ship.cc
===================================================================
--- /branches/playability/src/world_entities/space_ships/space_ship.cc	(revision 10108)
+++ /branches/playability/src/world_entities/space_ships/space_ship.cc	(revision 10109)
@@ -376,10 +376,10 @@
   this->secWeaponMan.showCrosshair();
   this->toList( OM_GROUP_01 );
-  /*
+  
   for(ObjectList<PNode>::const_iterator it = this->getNodesChildren().begin(); it != this->getNodesChildren().end(); it++)
   {
     if( likely( dynamic_cast<Weapon*>(*it) != NULL))
       dynamic_cast<WorldEntity*>(*it)->toList( OM_GROUP_01);
-  }*/
+  }
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( true);
   //this->attachCamera();
@@ -391,10 +391,10 @@
   this->secWeaponMan.hideCrosshair();
   this->toList( OM_GROUP_00);
-  /*
+  
   for(ObjectList<PNode>::const_iterator it = this->getNodesChildren().begin(); it != this->getNodesChildren().end(); it++)
   {
     if( likely( dynamic_cast<Weapon*>(*it) != NULL))
       dynamic_cast<WorldEntity*>(*it)->toList( OM_GROUP_00);
-  }*/
+  }
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( false);
   //this->detachCamera();
Index: /branches/playability/src/world_entities/weapons/heavy_blaster.cc
===================================================================
--- /branches/playability/src/world_entities/weapons/heavy_blaster.cc	(revision 10108)
+++ /branches/playability/src/world_entities/weapons/heavy_blaster.cc	(revision 10109)
@@ -101,4 +101,5 @@
   pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());
+  pj->toList(OM_GROUP_01_PROJ);
   pj->activate();
 }
Index: /branches/playability/src/world_entities/weapons/light_blaster.cc
===================================================================
--- /branches/playability/src/world_entities/weapons/light_blaster.cc	(revision 10108)
+++ /branches/playability/src/world_entities/weapons/light_blaster.cc	(revision 10109)
@@ -98,4 +98,5 @@
   pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());
+  pj->toList(OM_GROUP_01_PROJ);
   pj->activate();
 }
Index: /branches/playability/src/world_entities/weapons/medium_blaster.cc
===================================================================
--- /branches/playability/src/world_entities/weapons/medium_blaster.cc	(revision 10108)
+++ /branches/playability/src/world_entities/weapons/medium_blaster.cc	(revision 10109)
@@ -100,4 +100,5 @@
   pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());
+  pj->toList(OM_GROUP_01_PROJ);
   pj->activate();
 }
Index: /branches/playability/src/world_entities/weapons/swarm_launcher.cc
===================================================================
--- /branches/playability/src/world_entities/weapons/swarm_launcher.cc	(revision 10108)
+++ /branches/playability/src/world_entities/weapons/swarm_launcher.cc	(revision 10109)
@@ -163,6 +163,6 @@
       pj->setAbsDir(this->getAbsDir());
       dynamic_cast<SwarmProjectile*>(pj)->setTarget( (PNode*)(*eIterator) );
+      pj->toList(OM_GROUP_01_PROJ);
       pj->activate();
-
     }
   }
