Changeset 11071 for code/trunk/src/modules/docking/DockingEffect.cc
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/modules/docking/DockingEffect.cc
r10624 r11071 53 53 bool check = true; 54 54 55 for ( std::list<DockingEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++)55 for (DockingEffect* effect : effects) 56 56 { 57 57 if (dock) 58 check &= (*effect)->docking(player);58 check &= effect->docking(player); 59 59 else 60 check &= (*effect)->release(player);60 check &= effect->release(player); 61 61 } 62 62 … … 65 65 66 66 DockingTarget *DockingEffect::findTarget(std::string name) { 67 for ( ObjectList<DockingTarget>::iterator it = ObjectList<DockingTarget>::begin(); it != ObjectList<DockingTarget>::end(); ++it)67 for (DockingTarget* target : ObjectList<DockingTarget>()) 68 68 { 69 if ( (*it)->getName().compare(name) == 0)70 return (*it);69 if (target->getName().compare(name) == 0) 70 return target; 71 71 } 72 return NULL;72 return nullptr; 73 73 } 74 74 }
Note: See TracChangeset
for help on using the changeset viewer.