- Timestamp:
- Jan 17, 2016, 1:59:00 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.cc
r11059 r11065 103 103 bool visible = this->isVisible(); 104 104 105 for ( std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)105 for (HUDWeapon* hudWeapon : hudWeapons_) 106 106 { 107 (*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed108 (*it)->setVisible(visible);107 hudWeapon->changedVisibility(); //inform all Child Overlays that our visibility has changed 108 hudWeapon->setVisible(visible); 109 109 } 110 110 } … … 129 129 { 130 130 const std::vector<WeaponPack*>& weaponPacks = owner_->getWeaponSystem()->getAllWeaponPacks(); 131 132 for (std::vector<WeaponPack*>::const_iterator itPacks = weaponPacks.begin(); itPacks != weaponPacks.end(); ++itPacks) 131 for (WeaponPack* weaponPack : weaponPacks) 133 132 { 134 const std::vector<Weapon*>& weapons = (*itPacks)->getAllWeapons(); 135 136 for (std::vector<Weapon*>::const_iterator itWeapons = weapons.begin(); itWeapons != weapons.end(); ++itWeapons) 133 const std::vector<Weapon*>& weapons = weaponPack->getAllWeapons(); 134 for (Weapon* weapon : weapons) 137 135 { 138 this->weapons_.push_back( *itWeapons);136 this->weapons_.push_back(weapon); 139 137 } 140 138 } … … 149 147 int positionIndex = 0; 150 148 151 for ( std::vector<WeakPtr<Weapon> >::iterator it = weapons_.begin(); it != weapons_.end(); ++it)149 for (Weapon* weapon : weapons_) 152 150 { 153 151 HUDWeapon* hudWeapon = new HUDWeapon(this->getContext()); … … 155 153 hudWeapon->setOverlayGroup(this->getOverlayGroup()); 156 154 hudWeapon->setVisible(this->isVisible()); 157 hudWeapon->setWeapon( *it);155 hudWeapon->setWeapon(weapon); 158 156 hudWeapon->setAspectCorrection(false); 159 157 hudWeapon->setPickPoint(Vector2(0.0f,0.0f)); … … 170 168 Vector2 offset = this->getPosition(); 171 169 172 for ( std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)170 for (HUDWeapon* hudWeapon : hudWeapons_) 173 171 { 174 (*it)->setPositionOffset(offset);175 (*it)->setWeaponIndex(positionIndex);176 (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);172 hudWeapon->setPositionOffset(offset); 173 hudWeapon->setWeaponIndex(positionIndex); 174 hudWeapon->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_); 177 175 178 176 ++ positionIndex; … … 182 180 void HUDWeaponSystem::destroyHUDChilds() 183 181 { 184 for ( std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)182 for (HUDWeapon* hudWeapon : hudWeapons_) 185 183 { 186 (*it)->destroy();184 hudWeapon->destroy(); 187 185 } 188 186
Note: See TracChangeset
for help on using the changeset viewer.