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

Timestamp:

Dec 13, 2006, 3:19:40 PM (18 years ago)

Author:

marcscha

Message:

weapon, collision, particles

File:

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

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

@@ -23 +23 @@
 #include "particles/dot_emitter.h"
 #include "particles/sprite_particles.h"
+#include "space_ships/space_ship.h"
 
 #include "debug.h"
@@ -44 +45 @@
   this->setMinEnergy(1);
   this->setHealthMax(10);
-  this->lifeSpan = 2.0;
+  this->lifeSpan = 4.0;
   this->agility = 3.5;
   this->maxVelocity = 100;
@@ -64 +65 @@
 SwarmProjectile::~SwarmProjectile ()
 {
-  // delete this->emitter;
+
 
   /* this is normaly done by World.cc by deleting the ParticleEngine */
@@ -79 +80 @@
     SwarmProjectile::explosionParticles = NULL;
   }
-
+   delete this->emitter;
 }
 
@@ -96 +97 @@
     SwarmProjectile::trailParticles->setLifeSpan(1.0, .3);
     SwarmProjectile::trailParticles->setRadius(0.0, .5);
-    SwarmProjectile::trailParticles->setRadius(0.2, 4.0);
-    SwarmProjectile::trailParticles->setRadius(.5, 1.5);
-    SwarmProjectile::trailParticles->setRadius(1.0, 1.5);
+    SwarmProjectile::trailParticles->setRadius(0.2, 2.0);
+    SwarmProjectile::trailParticles->setRadius(.5, 1.0);
+    SwarmProjectile::trailParticles->setRadius(1.0, 0.6);
     SwarmProjectile::trailParticles->setColor(0.0, 1,0,0,.7);
     SwarmProjectile::trailParticles->setColor(0.2, .8,.8,0,.5);
@@ -145 +146 @@
     this->destroy( entity );
   this->hitEntity = entity;
+  dynamic_cast<SpaceShip*>(entity)->damage(this->getDamage(),0);
 }