Changeset 7896

Timestamp:

Feb 14, 2011, 11:21:33 PM (13 years ago)

Author:

landauf

Message:

actually I believe the condition should be the other way round (talking about r7895): never use a reload timer if the munition is stacked

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.0f;
 
         this->bAllowMunitionRefilling_ = false;

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

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