Changeset 10539 in orxonox.OLD for trunk/src/world_entities/weapons/swarm_launcher.cc

Timestamp:

Jan 31, 2007, 4:27:32 AM (17 years ago)

Author:

marcscha

Message:

Fixes for weapon systems

File:

• trunk/src/world_entities/weapons/swarm_launcher.cc (modified) (3 diffs)

trunk/src/world_entities/weapons/swarm_launcher.cc

@@ -22 +22 @@
 
 #include "model.h"
+#include "world_entities/npcs/npc.h"
 
 #include "state.h"
@@ -157 +158 @@
   PRINTF(0)("fire\n");
   Projectile* pj = NULL;
-  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->getOMListNumber() -1)) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 300)
+    if( ((*eIterator)->getOMListNumber() != (this->getOMListNumber())) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 300)
     {
       pj  = this->getProjectile();
@@ -172 +173 @@
       pj->setAbsDir(this->getAbsDir());
       dynamic_cast<SwarmProjectile*>(pj)->setTarget( (PNode*)(*eIterator) );
-      //pj->toList(OM_GROUP_01_PROJ);
       pj->activate();
     }