Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7896 for code/trunk/src


Ignore:
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

Location:
code/trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/modules/weapons/munitions/RocketMunition.cc

    r7895 r7896  
    4444        this->bUseSeparateMagazines_ = false;
    4545        this->bStackMunition_ = true;
    46         this->reloadTime_ = 0.0f;
    4746
    4847        this->bAllowMunitionRefilling_ = false;
  • code/trunk/src/orxonox/weaponsystem/Munition.cc

    r7895 r7896  
    459459        this->bLoaded_ = false;
    460460
    461         if (bUseReloadTime && munition->reloadTime_ > 0)
     461        if (bUseReloadTime && munition->reloadTime_ > 0 && !munition->bStackMunition_)
    462462        {
    463463            const ExecutorPtr& executor = createExecutor(createFunctor(&Magazine::loaded, this));
Note: See TracChangeset for help on using the changeset viewer.