Changeset 10196 in orxonox.OLD for branches/playability/src/world_entities/weapons/spike_thrower.cc

Timestamp:

Jan 8, 2007, 9:46:13 PM (18 years ago)

Author:

nicolasc

Message:

just another upload
GUI seems to work, but there are still some unexplainable segfaults

File:

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

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

@@ -146 +146 @@
 void SpikeThrower::fire()
 {
-  bool fired  = false;
+  Projectile* pj =  this->getProjectile();
+  if (pj == NULL)
+    return;
 
-  Projectile* pj = NULL;
-  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
-  {
-    if( ((*eIterator)->getOMListNumber() == OM_GROUP_00) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 300)
-    {
-      pj  = this->getProjectile();
-      if (pj == NULL)
-        return;
-      
-      fired = true;
-      pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*115.0 + VECTOR_RAND(10)));
+  // set the owner
+  pj->setOwner(this->getOwner());
 
-      pj->setParent(PNode::getNullParent());
-      pj->setAbsCoor(this->getEmissionPoint());
-      pj->setAbsDir(this->getAbsDir());
-//       dynamic_cast<SpikeProjectile*>(pj)->setTarget( (PNode*)(*eIterator) );
-      pj->toList(OM_GROUP_01_PROJ);
-      pj->activate();
-    }
-  }
-  if( !fired)
-    this->increaseEnergy( this->getProjectile()->getMinEnergy());
+  pj->setParent(PNode::getNullParent());
+
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*150);
+  pj->setAbsCoor(this->getEmissionPoint());
+
+  pj->setAbsDir(this->getAbsDir());
+  pj->activate();
 }