Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7104 in orxonox.OLD for trunk/src/world_entities


Ignore:
Timestamp:
Feb 7, 2006, 10:02:46 PM (19 years ago)
Author:
bensch
Message:

explosion renewed

Location:
trunk/src/world_entities
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/effects/explosion.cc

    r7103 r7104  
    3838{
    3939  this->setClassID(CL_EXPLOSION, "Explosion");
     40  this->toList(OM_DEAD_TICK);
    4041
    41   this->emitter = new BoxEmitter(Vector(10,10,10), 300, 50, M_2_PI);
     42  this->emitter = new BoxEmitter(Vector(10,10,10), 1000, 30, M_2_PI);
    4243  this->emitter->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
    4344  this->emitter->setParent(this);
     
    4546
    4647  this->lifeCycle = 0.0f;
    47   this->lifeTime = 0.5f;
     48  this->lifeTime = 1.0f;
    4849
    4950}
     
    8485    Explosion::explosionParticles->setRadius(.5, 15.0);
    8586    Explosion::explosionParticles->setRadius(1.0, 10.0);
    86     Explosion::explosionParticles->setColor(0.0, 1,0,0,1);
     87    Explosion::explosionParticles->setColor(0.0, 0,1,0,1);
    8788    Explosion::explosionParticles->setColor(0.5, .8,.8,0,.8);
    8889    Explosion::explosionParticles->setColor(0.8, .8,.8,.3,.8);
     
    9192
    9293  this->emitter->setSystem(Explosion::explosionParticles);
    93 
    94   this->updateNode(0);
    95   this->emitter->setEmissionRate(45.0);
    96   this->emitter->setEmissionVelocity(0.0);
    9794  this->toList(OM_DEAD_TICK);
    9895  this->lifeCycle = 0.0;
  • trunk/src/world_entities/npcs/ground_turret.cc

    r7103 r7104  
    127127  if(this->getHealth() > 0.0f && State::getPlayer() &&
    128128     State::getPlayer()->getPlayable() &&
    129      State::getPlayer()->getPlayable()->distance(this) < 150) // HACK
     129     State::getPlayer()->getPlayable()->distance(this) < 120) // HACK
    130130  {
    131131  if (likely(this->left != NULL))
Note: See TracChangeset for help on using the changeset viewer.