Changeset 645 for code/branches/FICN/src/orxonox/objects/weapon_system/base_weapon.cc

Timestamp:

Dec 19, 2007, 3:05:56 AM (16 years ago)

Author:

rgrieder

Message:

• weapon system up and running

File:

• code/branches/FICN/src/orxonox/objects/weapon_system/base_weapon.cc (modified) (2 diffs)

code/branches/FICN/src/orxonox/objects/weapon_system/base_weapon.cc

@@ -46 +46 @@
   
   CreateFactory(BaseWeapon);
+
+  float BaseWeapon::nextActionValidityPeriod_ = 0.5;
 
   BaseWeapon::BaseWeapon()
@@ -105 +107 @@
       {
       case PRIMARY_FIRE:
-        primaryFiring((unsigned int)(totalTime_ - actionStartTime_));
+        primaryFiring(totalTime_ - actionStartTime_);
         break;
 
       case SECONDARY_FIRE:
-        secondaryFiring((unsigned int)(totalTime_ - actionStartTime_));
+        secondaryFiring(totalTime_ - actionStartTime_);
         break;