Changeset 10688 for code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.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/LaserMunition.cc (modified) (3 diffs)

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

@@ -28 +28 @@
 
 /**
-    @file LaserMunition.h
+    @file LaserMunition.cc
     @brief Implementation of the LaserMunition class.
 */
@@ -43 +43 @@
         RegisterObject(LaserMunition);
 
-        this->maxMunitionPerMagazine_ = 20;
-        this->maxMagazines_ = 1;
-        this->magazines_ = 1;
+        this->maxMunitionPerMagazine_ = 10;
+        this->maxMagazines_ = 10;
+        this->magazines_ = 10;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = DEPLOYMENT_SEPARATE;
 
         this->bAllowMunitionRefilling_ = true;
@@ -55 +54 @@
         this->replenishInterval_ = 0.5f;
         this->replenishMunitionAmount_ = 1;
+
+        this->reloadTime_ = 0.8f;
     }
 }