Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7895


Ignore:
Timestamp:
Feb 14, 2011, 11:14:46 PM (13 years ago)
Author:
landauf
Message:

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.

Location:
code/trunk/src
Files:
2 edited

Legend:

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

    r7846 r7895  
    4444        this->bUseSeparateMagazines_ = false;
    4545        this->bStackMunition_ = true;
    46         this->reloadTime_ = 0.5f;
     46        this->reloadTime_ = 0.0f;
    4747
    4848        this->bAllowMunitionRefilling_ = false;
  • code/trunk/src/orxonox/weaponsystem/Munition.cc

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