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

Timestamp:

Dec 19, 2006, 11:14:27 PM (17 years ago)

Author:

nicolasc

Message:

bump

File:

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

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

@@ -117 +117 @@
 {
   printf("Collision with HBolt\n");
-  if (this->hitEntity != entity/* && entity->isA(CL_NPC)*/ || entity == this->target)
+  if (this->hitEntity != entity && entity->isA(CL_NPC) || entity == this->target)
     this->destroy( entity );
   this->hitEntity = entity;
   dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
-//   this->deactivate();
+  this->deactivate();
 }