Changeset 7847 for code/trunk/src/orxonox

Timestamp:

Feb 10, 2011, 5:42:29 PM (14 years ago)

Author:

landauf

Message:

fixed two bugs regarding the munition

Location:

code/trunk/src/orxonox/weaponsystem

Files:

• Munition.cc (modified) (1 diff)
• WeaponMode.cc (modified) (1 diff)

code/trunk/src/orxonox/weaponsystem/Munition.cc

@@ -185 +185 @@
                     if (magazine->munition_ > 0 && this->bAllowMultiMunitionRemovementUnderflow_)
                     {
-                        magazine->munition_ -= 0;
+                        magazine->munition_ = 0;
                         return true;
                     }

code/trunk/src/orxonox/weaponsystem/WeaponMode.cc

@@ -127 +127 @@
                 if (this->munition_->reload(this))
                 {
-                    if (!this->bParallelReload_)
-                        reloadtime += this->munition_->getReloadTime();
+                    if (this->bParallelReload_)
+                        reloadtime = std::max(this->reloadTime_, this->munition_->getReloadTime());
+                    else
+                        reloadtime = this->reloadTime_ + this->munition_->getReloadTime();
                 }
             }