Changeset 7208 for code/trunk/src/modules/pickup/items/SpeedPickup.cc
- Timestamp:
- Aug 24, 2010, 9:49:54 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/modules/pickup/items/SpeedPickup.cc
r7163 r7208 141 141 if(this->isUsed()) 142 142 { 143 if(!this-> getTimer()->isActive() && this->getTimer()->getRemainingTime() > 0.0f)143 if(!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() > 0.0f) 144 144 { 145 this-> getTimer()->unpauseTimer();145 this->durationTimer_.unpauseTimer(); 146 146 } 147 147 else 148 148 { 149 this-> startPickupTimer(this->getDuration());149 this->durationTimer_.setTimer(this->getDuration(), false, createExecutor(createFunctor(&SpeedPickup::pickupTimerCallback, this))); 150 150 } 151 151 engine->setSpeedAdd(this->getSpeedAdd()); … … 159 159 if(this->isOnce()) 160 160 { 161 if(!this-> getTimer()->isActive() && this->getTimer()->getRemainingTime() == this->getDuration())161 if(!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration()) 162 162 { 163 163 this->Pickupable::destroy(); … … 165 165 else 166 166 { 167 this-> getTimer()->pauseTimer();167 this->durationTimer_.pauseTimer(); 168 168 } 169 169 }
Note: See TracChangeset
for help on using the changeset viewer.