Changeset 7104 in orxonox.OLD for trunk/src

Timestamp:

Feb 7, 2006, 10:02:46 PM (19 years ago)

Author:

bensch

Message:

explosion renewed

Location:

trunk/src/world_entities

Files:

• effects/explosion.cc (modified) (4 diffs)
• npcs/ground_turret.cc (modified) (1 diff)

trunk/src/world_entities/effects/explosion.cc

@@ -38 +38 @@
 {
   this->setClassID(CL_EXPLOSION, "Explosion");
+  this->toList(OM_DEAD_TICK);
 
-  this->emitter = new BoxEmitter(Vector(10,10,10), 300, 50, M_2_PI);
+  this->emitter = new BoxEmitter(Vector(10,10,10), 1000, 30, M_2_PI);
   this->emitter->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
   this->emitter->setParent(this);
@@ -45 +46 @@
 
   this->lifeCycle = 0.0f;
-  this->lifeTime = 0.5f;
+  this->lifeTime = 1.0f;
 
 }
@@ -84 +85 @@
     Explosion::explosionParticles->setRadius(.5, 15.0);
     Explosion::explosionParticles->setRadius(1.0, 10.0);
-    Explosion::explosionParticles->setColor(0.0, 1,0,0,1);
+    Explosion::explosionParticles->setColor(0.0, 0,1,0,1);
     Explosion::explosionParticles->setColor(0.5, .8,.8,0,.8);
     Explosion::explosionParticles->setColor(0.8, .8,.8,.3,.8);
@@ -91 +92 @@
 
   this->emitter->setSystem(Explosion::explosionParticles);
-
-  this->updateNode(0);
-  this->emitter->setEmissionRate(45.0);
-  this->emitter->setEmissionVelocity(0.0);
   this->toList(OM_DEAD_TICK);
   this->lifeCycle = 0.0;

trunk/src/world_entities/npcs/ground_turret.cc

@@ -127 +127 @@
   if(this->getHealth() > 0.0f && State::getPlayer() &&
      State::getPlayer()->getPlayable() &&
-     State::getPlayer()->getPlayable()->distance(this) < 150) // HACK
+     State::getPlayer()->getPlayable()->distance(this) < 120) // HACK
   {
   if (likely(this->left != NULL))