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

Timestamp:

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

Author:

marcscha

Message:

pirate explosion fix

Location:

trunk/src/world_entities/projectiles

Files:

• hbolt.cc (modified) (2 diffs)
• lbolt.cc (modified) (2 diffs)
• mbolt.cc (modified) (2 diffs)
• swarm_projectile.cc (modified) (1 diff)

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");

trunk/src/world_entities/projectiles/lbolt.cc

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

trunk/src/world_entities/projectiles/mbolt.cc

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

trunk/src/world_entities/projectiles/swarm_projectile.cc

@@ -224 +224 @@
   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);