Changeset 10261 in orxonox.OLD for branches/playability/src/world_entities/projectiles/swarm_projectile.cc

Timestamp:

Jan 17, 2007, 4:14:41 PM (19 years ago)

Author:

marcscha

Message:

Fixes and cleanups

File:

• branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) (2 diffs)

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

@@ -129 +129 @@
 
 
-void SwarmProjectile::collidesWith(WorldEntity* entity, const Vector& location)
+void SwarmProjectile::hit (WorldEntity* entity, float damage)
 {
   if (this->hitEntity != entity)
@@ -135 +135 @@
   this->hitEntity = entity;
   //dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
-  this->destroy(this);
+ // this->destroy(this);
+  this->deactivate();
 }