Changeset 6759 in orxonox.OLD for trunk/src

Timestamp:

Jan 26, 2006, 2:36:14 AM (19 years ago)

Author:

bensch

Message:

timing of the turret is better now

Location:

trunk/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (1 diff)
• weapons/turret.cc (modified) (2 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -217 +217 @@
   this->burstEmitter->setParent(this);
   this->burstEmitter->setName("SpaceShip_Burst_emitter");
-
 
   this->burstSystem = new SpriteParticles(1000);

trunk/src/world_entities/weapons/turret.cc

@@ -81 +81 @@
   animation2->setInfinity(ANIM_INF_CONSTANT);
 
-  this->setStateDuration(WS_SHOOTING, .1);
+  this->setStateDuration(WS_SHOOTING, .6);
   this->setStateDuration(WS_RELOADING, 1.0f);
   this->setStateDuration(WS_ACTIVATING, .4);
@@ -97 +97 @@
   this->setEmissionPoint(1.684, 0.472, 0);
   //this->getProjectileFactory()->prepare(100);
-  this->loadModel("models/guns/turret1.obj");
-
 }