- Timestamp:
- Apr 6, 2011, 12:07:29 PM (13 years ago)
- Location:
- code/branches/dockingsystem
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/dockingsystem
- Property svn:mergeinfo changed
/code/branches/lastmanstanding3 (added) merged: 7903,8155,8165,8170-8175 /code/branches/tetris (added) merged: 8104-8107 /code/trunk (added) merged: 8108,8178-8179,8193
- Property svn:mergeinfo changed
-
code/branches/dockingsystem/src/modules/objects/triggers/MultiTrigger.cc
r7601 r8194 116 116 } 117 117 118 // Check if the object is active (this is NOT MultiTrigger::isActive()!) 118 // Check if the object is active (this is NOT MultiTrigger::isActive()!), it is whether the MultiTrigger actually does anything, ever. 119 119 if (!this->BaseObject::isActive()) 120 120 return; … … 205 205 { 206 206 // If the MultiTrigger has not exceeded its remaining activations. 207 if(this-> remainingActivations_ > 0)207 if(this->hasRemainingActivations()) 208 208 { 209 209 this->active_.insert(state->originator); … … 218 218 { 219 219 // If the MultiTrigger doesn't stay active or hasn't' exceeded its remaining activations. 220 if(!this->getStayActive() || this-> remainingActivations_ > 0)220 if(!this->getStayActive() || this->hasRemainingActivations()) 221 221 this->active_.erase(state->originator); 222 222 else
Note: See TracChangeset
for help on using the changeset viewer.