Changeset 9235 in orxonox.OLD for trunk/src/world_entities/projectiles/laser.cc

Timestamp:

Jul 5, 2006, 4:39:02 PM (18 years ago)

Author:

bensch

Message:

merged the presentation back

File:

• trunk/src/world_entities/projectiles/laser.cc (modified) (4 diffs)

trunk/src/world_entities/projectiles/laser.cc

@@ -42 +42 @@
 
   this->setMinEnergy(10);
-  this->setHealthMax(10);
+  this->setHealthMax(0);
   this->lifeSpan = 5.0;
 
@@ -88 +88 @@
   }
 
-  this->setHealth(10);
+  this->setDamage(0);
+  this->setHealth(0);
 }
 
@@ -107 +108 @@
 {
   if (this->hitEntity != entity && entity->isA(CL_NPC))
-    this->destroy();
+    this->destroy( entity );
   this->hitEntity = entity;
 }
@@ -128 +129 @@
  *  the function gets called, when the projectile is destroyed
 */
-void Laser::destroy ()
+void Laser::destroy (WorldEntity* killer)
 {
-  Projectile::destroy();
+  Projectile::destroy( killer );
   PRINTF(5)("DESTROY Laser\n");
   this->lifeCycle = .95; //!< @todo calculate this usefully.