Changeset 10132 in orxonox.OLD for branches/playability/src/world_entities/weapons

Timestamp:

Dec 20, 2006, 5:36:18 PM (18 years ago)

Author:

marcscha

Message:

Firing Echo fix on WM

Location:

branches/playability/src/world_entities/weapons

Files:

• medium_blaster.cc (modified) (1 diff)
• weapon_manager.cc (modified) (1 diff)

branches/playability/src/world_entities/weapons/medium_blaster.cc

@@ -56 +56 @@
 
   this->setStateDuration(WS_RELOADING, 0);
-  this->setStateDuration(WS_ACTIVATING, 0); //.5);
-  this->setStateDuration(WS_DEACTIVATING, 0); // 1);
+  this->setStateDuration(WS_ACTIVATING, .5); //.5);
+  this->setStateDuration(WS_DEACTIVATING, 1); // 1);
 
   this->setEnergyMax(500);

branches/playability/src/world_entities/weapons/weapon_manager.cc

@@ -435 +435 @@
   {
           firingWeapon = this->currentSlotConfig[i].currentWeapon;
+      if( firingWeapon != NULL && firingWeapon->getCurrentState() == WS_SHOOTING) continue;
           if( firingWeapon != NULL) firingWeapon->requestAction(WA_SHOOT);
   }