Changeset 7896 for code/trunk/src/orxonox

Timestamp:

Feb 14, 2011, 11:21:33 PM (14 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

File:

• code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) (1 diff)

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));