Changeset 10274 in orxonox.OLD for branches/playability/src/world_entities/projectiles/hbolt.cc

Timestamp:

Jan 17, 2007, 6:42:07 PM (17 years ago)

Author:

marcscha

Message:

fixes and workaround bugs of Orx

File:

• branches/playability/src/world_entities/projectiles/hbolt.cc (modified) (4 diffs)

branches/playability/src/world_entities/projectiles/hbolt.cc

@@ -45 +45 @@
   this->setMinEnergy(10);
   this->setHealthMax(0);
-  this->lifeSpan = 7.0;
+  this->lifeSpan = 2.0;
 
   this->angle = 0;
@@ -84 +84 @@
 void HBolt::activate()
 {
+  this->toList(OM_ENVIRON);
   if (unlikely(HBolt::explosionParticles == NULL))
   {
@@ -108 +109 @@
   this->lifeCycle = 0.0;
 
-  this->toList(OM_NULL);
+  this->toList(OM_DEAD);
   this->removeNode();
   HBolt::fastFactory->kill(this);
+
 }
 
 
-void HBolt::hit (WorldEntity* entity, float damage)
+void HBolt::hit (float damage, WorldEntity* entity )
 {
   printf("Collision with HBolt\n");
@@ -140 +142 @@
   this->angle += this->rotationSpeed * dt;
 
-
+  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
+  {
+    if( ((*eIterator)->getOMListNumber() == OM_GROUP_00)  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
+    {
+      (*eIterator)->hit (this->getDamage(),this);
+      this->deactivate();
+  PRINTF(0)("HBolt destroyed\n");
+    }
+  }
 }