Changeset 5049 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons

Timestamp:

Aug 16, 2005, 9:47:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some weapon-specifics

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• test_gun.cc (modified) (1 diff)
• turret.cc (modified) (1 diff)

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -120 +120 @@
   this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->setStateDuration(WS_SHOOTING, .1);
-  this->setStateDuration(WS_RELOADING, 1);
+  this->setStateDuration(WS_SHOOTING, .3);
+  this->setStateDuration(WS_RELOADING, .5);
   this->setStateDuration(WS_ACTIVATING, .4);
   this->setStateDuration(WS_DEACTIVATING, .4);

orxonox/trunk/src/world_entities/weapons/turret.cc

@@ -82 +82 @@
   animation2->setInfinity(ANIM_INF_CONSTANT);
 
-  this->setStateDuration(WS_SHOOTING, .4);
-  this->setStateDuration(WS_RELOADING, 2);
+  this->setStateDuration(WS_SHOOTING, .2);
+  this->setStateDuration(WS_RELOADING, .5);
   this->setStateDuration(WS_ACTIVATING, .4);
   this->setStateDuration(WS_DEACTIVATING, .4);