Changeset 10688 for code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.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/orxonox/weaponsystem/Munition.cc (modified) (19 diffs)

code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc

@@ -45 +45 @@
         this->magazines_ = 10;
 
-        this->bUseSeparateMagazines_ = false;
-        this->bStackMunition_ = true;
+        this->deployment_ = DEPLOYMENT_STACK;
         this->bAllowMunitionRefilling_ = true;
         this->bAllowMultiMunitionRemovementUnderflow_ = true;
 
-        this->reloadTime_ = 0;
+        this->reloadTime_ = 0.5f;
     }
 
@@ -61 +60 @@
     Munition::Magazine* Munition::getMagazine(WeaponMode* user) const
     {
-        if (this->bUseSeparateMagazines_)
+        if (deployment_ == DEPLOYMENT_SEPARATE)
         {
             // For separated magazines we definitively need a given user
@@ -87 +86 @@
         if (magazine)
         {
-            if (this->bStackMunition_)
+            if (deployment_ == DEPLOYMENT_STACK)
                 // With stacked munition every magazine contributes to the total amount
                 return this->maxMunitionPerMagazine_ * this->magazines_ + magazine->munition_;
@@ -109 +108 @@
     unsigned int Munition::getNumMagazines() const
     {
-        if (this->bStackMunition_)
+        if (deployment_ == DEPLOYMENT_STACK)
         {
             // If we stack munition and the current magazine is still full, it counts too
@@ -122 +121 @@
     unsigned int Munition::getMaxMunition() const
     {
-        if (this->bStackMunition_)
+        if (deployment_ == DEPLOYMENT_STACK)
             return this->maxMunitionPerMagazine_ * this->maxMagazines_;
         else
@@ -135 +134 @@
             unsigned int munition = magazine->munition_;
 
-            // If we stack munition, we con't care about the current magazine - we just need enough munition in total
-            if (this->bStackMunition_)
+            // If we stack munition, we don't care about the current magazine - we just need enough munition in total
+            if (deployment_ == DEPLOYMENT_STACK)
                 munition += this->maxMunitionPerMagazine_ * this->magazines_;
 
@@ -169 +168 @@
             {
                 // Not enough munition
-                if (this->bStackMunition_)
+                if (deployment_ == DEPLOYMENT_STACK)
                 {
                     // We stack munition, so just take what we can and then load the next magazine
@@ -199 +198 @@
     {
         // As long as we have enough magazines (and don't stack munition) we can reload
-        return (this->magazines_ > 0 && !this->bStackMunition_);
+        return (this->magazines_ > 0 && !deployment_ == DEPLOYMENT_STACK);
     }
 
@@ -207 +206 @@
         if (magazine)
         {
-            if (this->bStackMunition_)
+            if (deployment_ == DEPLOYMENT_STACK)
                 // With stacked munition, we never have to reload
                 return false;
@@ -231 +230 @@
 
         // If we use separate magazines for each user, we definitively need a user given
-        if (this->bUseSeparateMagazines_ && !user)
+        if (deployment_ == DEPLOYMENT_SEPARATE && !user)
             return false;
 
         // If we don't use separate magazines, set user to 0
-        if (!this->bUseSeparateMagazines_)
+        if (!deployment_ == DEPLOYMENT_SEPARATE)
             user = 0;
 
@@ -260 +259 @@
             return false;
 
-        if (this->bStackMunition_)
+        if (deployment_ == DEPLOYMENT_STACK)
         {
             // If we stack munition, we can always add munition until we reach the limit
@@ -281 +280 @@
             return false;
 
-        if (this->bStackMunition_)
+        if (deployment_ == DEPLOYMENT_STACK)
         {
             // Stacking munition means, if a magazine gets full, the munition adds to a new magazine
@@ -340 +339 @@
         // TODO: 'amount' is not used
 
-        if (this->bStackMunition_)
+        if (deployment_ == DEPLOYMENT_STACK)
             // If we stack munition, we can always add new magazines because they contribute directly to the munition
             return (this->getNumMunition(0) < this->getMaxMunition());
@@ -357 +356 @@
 
         // If zero or less magazines are needed, we definitively don't need more magazines (unless we stack munition - then a magazine contributes directly to the munition)
-        if (needed_magazines <= 0 && !this->bStackMunition_)
+        if (needed_magazines <= 0 && !deployment_ == DEPLOYMENT_STACK)
             return false;
 
@@ -369 +368 @@
             // We get more magazines than we need, so just add the needed amount
             this->magazines_ += needed_magazines;
-            if (this->bStackMunition_)
+            if (deployment_ == DEPLOYMENT_STACK)
             {
                 // We stack munition, so the additional amount contributes directly to the munition of the current magazine
@@ -383 +382 @@
     bool Munition::canRemoveMagazines(unsigned int amount) const
     {
-        if (this->bStackMunition_)
+        if (deployment_ == DEPLOYMENT_STACK)
         {
             if (this->magazines_ >= amount)
@@ -422 +421 @@
             this->magazines_ -= amount;
         }
-        else if (this->bStackMunition_)
+        else if (deployment_ == DEPLOYMENT_STACK)
         {
             // We don't have enough magazines, but we're stacking munition, so additionally remove the bullets from the current magazine
@@ -437 +436 @@
     {
         // If we use separate magazines, we need a user
-        if (this->bUseSeparateMagazines_ && !user)
+        if (deployment_ == DEPLOYMENT_SEPARATE && !user)
             return false;
 
         // If we don't use separate magazines, set user to 0
-        if (!this->bUseSeparateMagazines_)
+        if (!deployment_ == DEPLOYMENT_SEPARATE)
             user = 0;
 
@@ -465 +464 @@
         this->bLoaded_ = false;
 
-        if (bUseReloadTime && munition->reloadTime_ > 0 && !munition->bStackMunition_)
+        if (bUseReloadTime && munition->reloadTime_ > 0 && !munition->deployment_ == DEPLOYMENT_STACK)
         {
             const ExecutorPtr& executor = createExecutor(createFunctor(&Magazine::loaded, this));