Index: trunk/src/world_entities/projectiles/hbolt.cc
===================================================================
--- trunk/src/world_entities/projectiles/hbolt.cc	(revision 10539)
+++ trunk/src/world_entities/projectiles/hbolt.cc	(revision 10545)
@@ -20,4 +20,5 @@
 #include "state.h"
 #include "model.h"
+#include "world_entities/npcs/npc.h"
 
 #include "particles/dot_emitter.h"
@@ -147,9 +148,9 @@
   this->angle += this->rotationSpeed * dt;
 
-  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
+  for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
   {
-    if( ((*eIterator)->getOMListNumber() != (this->origList -1))   && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
+    if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
     {
-      (*eIterator)->hit (this->getDamage(),this);
+      (*eIterator)->destroy(this); //hit (this->getDamage(),this);
       this->deactivate();
   PRINTF(0)("HBolt destroyed\n");
Index: trunk/src/world_entities/projectiles/lbolt.cc
===================================================================
--- trunk/src/world_entities/projectiles/lbolt.cc	(revision 10539)
+++ trunk/src/world_entities/projectiles/lbolt.cc	(revision 10545)
@@ -22,4 +22,6 @@
 #include "state.h"
 #include "model.h"
+
+#include "world_entities/npcs/npc.h"
 
 #include "particles/dot_emitter.h"
@@ -148,9 +150,9 @@
   angle += rotationSpeed * dt;
 
-  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
+  for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
   {
-    if( ((*eIterator)->getOMListNumber() != (this->origList -1))   && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
+    if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
     {
-      (*eIterator)->hit (this->getDamage(),this);
+      (*eIterator)->destroy(this); //hit (this->getDamage(),this);
       this->deactivate();
   PRINTF(0)("LBolt destroyed\n");
Index: trunk/src/world_entities/projectiles/mbolt.cc
===================================================================
--- trunk/src/world_entities/projectiles/mbolt.cc	(revision 10539)
+++ trunk/src/world_entities/projectiles/mbolt.cc	(revision 10545)
@@ -22,4 +22,6 @@
 #include "state.h"
 #include "model.h"
+
+#include "world_entities/npcs/npc.h"
 
 #include "particles/dot_emitter.h"
@@ -176,9 +178,9 @@
   this->trail->tick(dt);
 
-  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
+  for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
   {
     if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
     {
-      (*eIterator)->hit (this->getDamage(),this);
+      (*eIterator)->destroy(this); //hit (this->getDamage(),this);
       this->deactivate();
       PRINTF(0)("MBolt destroyed\n");
Index: trunk/src/world_entities/projectiles/swarm_projectile.cc
===================================================================
--- trunk/src/world_entities/projectiles/swarm_projectile.cc	(revision 10539)
+++ trunk/src/world_entities/projectiles/swarm_projectile.cc	(revision 10545)
@@ -224,5 +224,5 @@
   this->curDir = this->velocity;
 
-  if( this->target != NULL && (this->getAbsCoor() - this->target->getAbsCoor()).len() < 3)   // FIXME  Temp fake workaround for collision :)
+  if( this->target != NULL && (this->getAbsCoor() - this->target->getAbsCoor()).len() < 3)   // HACK  Temp fake workaround for collision :)
   {
     dynamic_cast<WorldEntity*>(target)->destroy(this); //hit(this->getDamage(), this);
