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

Timestamp:

Dec 19, 2006, 11:18:22 AM (17 years ago)

Author:

marcscha

Message:

velocity fix

Location:

branches/playability/src/world_entities/projectiles

Files:

• mbolt.cc (modified) (3 diffs)
• swarm_projectile.cc (modified) (2 diffs)

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

@@ -77 +77 @@
 
   
-  this->trail = new Trail(6,1,.4);
-  this->trail->setParent( this);
+  this->trail = new Trail(6,4,.1, this);
+  //this->trail->setParent( this);
   this->trail->setTexture( "maps/laser.png");
+  this->trail->setAbsCoor(this->getAbsCoor() - Vector(1,0,0));
 }
 
@@ -126 +127 @@
   this->emitter->setEmissionRate(10.0);
   this->emitter->setEmissionVelocity(0);
-  this->updateNode(0);
 }
 
@@ -144 +144 @@
 void MBolt::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  PRINTF(0)("MBolt collides pretest\n");
-  if( entity == NULL || dynamic_cast<SpaceShip*>(entity) == NULL)
+  PRINTF(5)("MBolt collides pretest\n");
+  if( entity == NULL)
     return;
 
   PRINTF(0)("MBolt collides\n");
   dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
-  entity->destroy(this);
-  this->deactivate();
+  //entity->destroy(this);
+  //this->deactivate();
 }
 

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

@@ -59 +59 @@
   this->physDamage = 200;
 
-  this->trail = new Trail(2.5,4,.2);
-  this->trail->setParent( this);
+  this->trail = new Trail(2.5,4,.2, this);
+  //this->trail->setParent( this);
   this->trail->setTexture( "maps/laser.png");
 }
@@ -240 +240 @@
   this->lastDir = this->curDir;
   this->curDir = this->velocity;
+  if( (this->getAbsCoor() - this->target->getAbsCoor()).len() < 4)   // FIXME  Temp fake workaround for collision :)
+  {
+    dynamic_cast<WorldEntity*>(target)->destroy( this);
+    this->destroy( this);
+  }
 }