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

Timestamp:

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

Author:

nicolasc

Message:

bump

Location:

branches/playability/src/world_entities/projectiles

Files:

• hbolt.cc (modified) (1 diff)
• swarm_projectile.cc (modified) (3 diffs)

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();
 }
 

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

@@ -137 +137 @@
   this->hitEntity = entity;
   dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
-  this->destroy(NULL);
+  this->destroy(this);
 }
 
@@ -243 +243 @@
   this->lastDir = this->curDir;
   this->curDir = this->velocity;
-  if( (this->getAbsCoor() - this->target->getAbsCoor()).len() < 1)   // FIXME  Temp fake workaround for collision :)
+  if( (this->getAbsCoor() - this->target->getAbsCoor()).len() < 3)   // FIXME  Temp fake workaround for collision :)
   {
     dynamic_cast<WorldEntity*>(target)->destroy( this);
@@ -256 +256 @@
 {
 
-  printf("THIS SHOULD WORK!\n");
+//   printf("THIS SHOULD WORK!\n");
 
   Projectile::destroy( killer );