Changeset 10650 for code/trunk/src/orxonox/weaponsystem/WeaponMode.cc

Timestamp:

Oct 12, 2015, 10:57:00 PM (10 years ago)

Author:

fvultier

Message:

There is now a spaceship that uses the gravity bomb. Minor documentation improvements.

File:

• code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) (2 diffs)

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

@@ -128 +128 @@
         if (!this->bReloading_ && this->munition_ && this->munition_->takeMunition(this->munitionPerShot_, this))
         {
-            float reloadtime = this->reloadTime_;
+            float tempReloadtime = this->reloadTime_;
 
             if (this->bAutoReload_ && this->munition_->needReload(this))
@@ -135 +135 @@
                 {
                     if (this->bParallelReload_)
-                        reloadtime = std::max(this->reloadTime_, this->munition_->getReloadTime());
+                        tempReloadtime = std::max(this->reloadTime_, this->munition_->getReloadTime());
                     else
-                        reloadtime = this->reloadTime_ + this->munition_->getReloadTime();
+                        tempReloadtime = this->reloadTime_ + this->munition_->getReloadTime();
                 }
             }
 
             this->bReloading_ = true;
-            this->reloadTimer_.setInterval(reloadtime);
+            this->reloadTimer_.setInterval(tempReloadtime);
             this->reloadTimer_.startTimer();