Changeset 6162 in orxonox.OLD for trunk/src/world_entities/weapons/laser.cc

Timestamp:

Dec 19, 2005, 4:52:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the spaceshipcontroll branche into the trunk
merged with command
svn merge -r6036:HEAD spaceshipcontrol/ ../trunk/
no conflicts

File:

• trunk/src/world_entities/weapons/laser.cc (modified) (1 diff)

trunk/src/world_entities/weapons/laser.cc

@@ -45 +45 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->lifeSpan = 1.0;
+  this->lifeSpan = 5.0;
 
   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);