Changeset 7895 for code/trunk

Timestamp:

Feb 14, 2011, 11:14:46 PM (14 years ago)

Author:

landauf

Message:

implemented instant reloading of rocket munition because this was a little bothersome with 'T' key which is not OnHold but OnPress.
not exactly sure why I originally put the condition there in Munition.cc, but it looks wrong, so I removed it.

Location:

code/trunk/src

Files:

• modules/weapons/munitions/RocketMunition.cc (modified) (1 diff)
• orxonox/weaponsystem/Munition.cc (modified) (1 diff)

code/trunk/src/modules/weapons/munitions/RocketMunition.cc

@@ -44 +44 @@
         this->bUseSeparateMagazines_ = false;
         this->bStackMunition_ = true;
-        this->reloadTime_ = 0.5f;
+        this->reloadTime_ = 0.0f;
 
         this->bAllowMunitionRefilling_ = false;

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

@@ -459 +459 @@
         this->bLoaded_ = false;
 
-        if (bUseReloadTime && (munition->reloadTime_ > 0 || munition->bStackMunition_))
+        if (bUseReloadTime && munition->reloadTime_ > 0)
         {
             const ExecutorPtr& executor = createExecutor(createFunctor(&Magazine::loaded, this));