Changeset 10078 in orxonox.OLD for branches/playability/src/world_entities/weapons

Timestamp:

Dec 14, 2006, 10:58:41 AM (18 years ago)

Author:

marcscha

Message:

Update in swarm launcher, swarm missile, mbolt

File:

• branches/playability/src/world_entities/weapons/swarm_launcher.cc (modified) (1 diff)

branches/playability/src/world_entities/weapons/swarm_launcher.cc

@@ -145 +145 @@
 {
   Projectile* pj = NULL;
-  int i = 0;
-  std::list<WorldEntity*> eList  = State::getObjectManager()->getEntityList( OM_GROUP_00);
-  list<WorldEntity*>::iterator eIterator;
-  PRINTF(0)("Iterator output: %i\n",eList.size());
-  for( eIterator = eList.begin(); eIterator != eList.end(); eIterator++);
+  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
   {
-    PRINTF(0)("Iterator step: %i with content: %s\n",++i,*eIterator);
-    if( (dynamic_cast<WorldEntity*>(*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 50000.0)
+    if( ((*eIterator)->getOMListNumber() == OM_GROUP_00) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 100)
     {
       pj  = this->getProjectile();
       if (pj == NULL)
         return;
-
-          pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*165.0 + VECTOR_RAND(20))*.5);
+          pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*165.0 + VECTOR_RAND(20)));
         
-          pj->setParent(PNode::getNullParent());
-          pj->setAbsCoor(this->getEmissionPoint());
-          pj->setAbsDir(this->getAbsDir());
+          pj->setParent( PNode::getNullParent());
+          pj->setAbsCoor( this->getEmissionPoint());
+          pj->setAbsDir( this->getAbsDir());
           pj->setTarget( *eIterator);
           pj->activate();
-      this->increaseEnergy( pj->getMinEnergy());
     }
   }
-  this->increaseEnergy( - pj->getMinEnergy());
 }