Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7546 for code/trunk/src


Ignore:
Timestamp:
Oct 15, 2010, 8:43:02 AM (14 years ago)
Author:
dafrick
Message:

Ok, this should finally do it.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/modules/pickup/items/InvisiblePickup.cc

    r7545 r7546  
    134134            this->setInvisible(false);
    135135
    136             if((!this->isContinuous() && this->isImmediate()) || (!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration()))
     136            if((!this->isContinuous() && this->isImmediate()) || (this->isContinuous() && !this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration()))
    137137            {
    138138                this->Pickupable::destroy();
    139139            }
    140             else if(this->durationTimer_.isActive())
     140            else if(this->isContinuous() && this->durationTimer_.isActive())
    141141            {
    142142                this->durationTimer_.pauseTimer();
Note: See TracChangeset for help on using the changeset viewer.