[Orxonox-commit 3203] r7896 - in code/trunk/src: modules/weapons/munitions orxonox/weaponsystem

[landauf at orxonox.net]

Author: landauf
Date: 2011-02-14 23:21:33 +0100 (Mon, 14 Feb 2011)
New Revision: 7896

Modified:
   code/trunk/src/modules/weapons/munitions/RocketMunition.cc
   code/trunk/src/orxonox/weaponsystem/Munition.cc
Log:
actually I believe the condition should be the other way round (talking about r7895): never use a reload timer if the munition is stacked

Modified: code/trunk/src/modules/weapons/munitions/RocketMunition.cc
===================================================================
--- code/trunk/src/modules/weapons/munitions/RocketMunition.cc	2011-02-14 22:14:46 UTC (rev 7895)
+++ code/trunk/src/modules/weapons/munitions/RocketMunition.cc	2011-02-14 22:21:33 UTC (rev 7896)
@@ -43,7 +43,6 @@
 
         this->bUseSeparateMagazines_ = false;
         this->bStackMunition_ = true;
-        this->reloadTime_ = 0.0f;
 
         this->bAllowMunitionRefilling_ = false;
         this->bAllowMultiMunitionRemovementUnderflow_ = false;

Modified: code/trunk/src/orxonox/weaponsystem/Munition.cc
===================================================================
--- code/trunk/src/orxonox/weaponsystem/Munition.cc	2011-02-14 22:14:46 UTC (rev 7895)
+++ code/trunk/src/orxonox/weaponsystem/Munition.cc	2011-02-14 22:21:33 UTC (rev 7896)
@@ -458,7 +458,7 @@
         this->munition_ = 0;
         this->bLoaded_ = false;
 
-        if (bUseReloadTime && munition->reloadTime_ > 0)
+        if (bUseReloadTime && munition->reloadTime_ > 0 && !munition->bStackMunition_)
         {
             const ExecutorPtr& executor = createExecutor(createFunctor(&Magazine::loaded, this));
             executor->setDefaultValues(munition);