Changeset 10274 in orxonox.OLD for branches/playability/src/world_entities/projectiles/mbolt.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/mbolt.cc (modified) (4 diffs)

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

@@ -53 +53 @@
   this->setMinEnergy(4);
   this->setHealthMax(0);
-  this->lifeSpan = 3.0;
+  this->lifeSpan = 1.5;
   this->angle     = 0;
 
@@ -107 +107 @@
 void MBolt::activate()
 {
+  this->toList(OM_ENVIRON);
   if (unlikely(MBolt::explosionParticles == NULL))
   {
@@ -141 +142 @@
 }
 
-void MBolt::hit (WorldEntity* entity, float damage)
+void MBolt::hit (float damage, WorldEntity* entity )
 {
 
@@ -170 +171 @@
   this->angle += MBolt::rotationSpeed * dt;
   this->trail->tick(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)("MBolt destroyed\n");
+    }
+  }
 }