[Orxonox-commit 6376] r11033 - code/branches/fabienHS15/src/orxonox/weaponsystem
fvultier at orxonox.net
fvultier at orxonox.net
Mon Jan 4 09:25:34 CET 2016
Author: fvultier
Date: 2016-01-04 09:25:33 +0100 (Mon, 04 Jan 2016)
New Revision: 11033
Modified:
code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc
Log:
Bug in Munition.cc fixed.
Modified: code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc
===================================================================
--- code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc 2016-01-03 23:07:42 UTC (rev 11032)
+++ code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc 2016-01-04 08:25:33 UTC (rev 11033)
@@ -541,7 +541,7 @@
this->munition_ = 0;
this->bLoaded_ = false;
- if (bUseReloadTime && munition->reloadTime_ > 0 && !munition->deployment_ == MunitionDeployment::Stack)
+ if (bUseReloadTime && munition->reloadTime_ > 0 && munition->deployment_ != MunitionDeployment::Stack)
{
const ExecutorPtr& executor = createExecutor(createFunctor(&Magazine::loaded, this));
executor->setDefaultValues(munition);
More information about the Orxonox-commit
mailing list