Changeset 10545 in orxonox.OLD for trunk/src/world_entities/projectiles/hbolt.cc

Timestamp:

Jan 31, 2007, 5:39:05 AM (17 years ago)

Author:

marcscha

Message:

pirate explosion fix

File:

• trunk/src/world_entities/projectiles/hbolt.cc (modified) (2 diffs)

trunk/src/world_entities/projectiles/hbolt.cc

@@ -20 +20 @@
 #include "state.h"
 #include "model.h"
+#include "world_entities/npcs/npc.h"
 
 #include "particles/dot_emitter.h"
@@ -147 +148 @@
   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");