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

Timestamp:

Dec 16, 2006, 2:12:41 AM (17 years ago)

Author:

marcscha

Message:

Some surprises for comming wednesday

File:

• branches/playability/src/world_entities/projectiles/hbolt.cc (modified) (1 diff)

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

@@ -122 +122 @@
     this->destroy( entity );
   this->hitEntity = entity;
-  dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),0);
-//   this->deactivate();
+  dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
+  this->deactivate();
 }