Changeset 10132 in orxonox.OLD for branches/playability/src/world_entities/projectiles/mbolt.cc

Timestamp:

Dec 20, 2006, 5:36:18 PM (17 years ago)

Author:

marcscha

Message:

Firing Echo fix on WM

File:

• branches/playability/src/world_entities/projectiles/mbolt.cc (modified) (3 diffs)

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

@@ -78 +78 @@
   this->buildObbTree(4);
   
-  this->trail = new Trail(6,4,.1, this);
+  this->trail = new Trail(6, 4, .1, this);
   //this->trail->setParent( this);
   this->trail->setTexture( "maps/laser.png");
@@ -124 +124 @@
   this->setHealth(0);
 
-
   this->emitter->setSpread(0);
   this->emitter->setEmissionRate(10.0);
@@ -150 +149 @@
   this->hitEntity = entity;
   dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
-  this->destroy(this);
+  //this->destroy(this);
+  this->deactivate();
   
   return;
 
-  if( entity == NULL || dynamic_cast<SpaceShip*>(entity) == NULL)
-    return;
-
-  dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
+  //dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
   //entity->destroy(this);
   //this->deactivate();