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

[landauf at orxonox.net]

Author: landauf
Date: 2011-02-14 23:14:46 +0100 (Mon, 14 Feb 2011)
New Revision: 7895

Modified:
   code/trunk/src/modules/weapons/munitions/RocketMunition.cc
   code/trunk/src/orxonox/weaponsystem/Munition.cc
Log:
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.

Modified: code/trunk/src/modules/weapons/munitions/RocketMunition.cc
===================================================================
--- code/trunk/src/modules/weapons/munitions/RocketMunition.cc	2011-02-14 22:02:58 UTC (rev 7894)
+++ code/trunk/src/modules/weapons/munitions/RocketMunition.cc	2011-02-14 22:14:46 UTC (rev 7895)
@@ -43,7 +43,7 @@
 
         this->bUseSeparateMagazines_ = false;
         this->bStackMunition_ = true;
-        this->reloadTime_ = 0.5f;
+        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:02:58 UTC (rev 7894)
+++ code/trunk/src/orxonox/weaponsystem/Munition.cc	2011-02-14 22:14:46 UTC (rev 7895)
@@ -458,7 +458,7 @@
         this->munition_ = 0;
         this->bLoaded_ = false;
 
-        if (bUseReloadTime && (munition->reloadTime_ > 0 || munition->bStackMunition_))
+        if (bUseReloadTime && munition->reloadTime_ > 0)
         {
             const ExecutorPtr& executor = createExecutor(createFunctor(&Magazine::loaded, this));
             executor->setDefaultValues(munition);