Changeset 10688 for code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc

Timestamp:

Oct 24, 2015, 10:51:18 PM (10 years ago)

Author:

fvultier

Message:

There is now a HUD that shows the status of the weapon system: all weapons, weapon modes and their munition. Progress bars show the progress of replenishing munition.

File:

• code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc (modified) (2 diffs)

code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc

@@ -28 +28 @@
 
 /**
-    @file FusionMunition.h
+    @file FusionMunition.cc
     @brief Implementation of the FusionMunition class.
 */
@@ -47 +47 @@
         this->magazines_ = 10;
 
-        this->bUseSeparateMagazines_ = true;
-        this->bStackMunition_ = false;
+        this->deployment_ = DEPLOYMENT_SEPARATE;
+
         this->reloadTime_ = 1.0f;
 
         this->bAllowMunitionRefilling_ = true;
         this->bAllowMultiMunitionRemovementUnderflow_ = true;
+
+        this->reloadTime_ = 0.5f;
     }
 }