- 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/HUDWeapon.cc
r11059 r11065 76 76 if (!weapon_) 77 77 { 78 // TODO: destroy this HUD id the Weapon does no more exist. (Wehen the weak pointer is NULL)78 // TODO: destroy this HUD id the Weapon does no more exist. (Wehen the weak pointer is null) 79 79 } 80 80 } … … 114 114 bool visible = this->isVisible(); 115 115 116 for ( std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)117 { 118 (*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed119 (*it)->setVisible(visible);116 for (HUDWeaponMode* hudWeaponMode : hudWeaponModes_) 117 { 118 hudWeaponMode->changedVisibility(); //inform all Child Overlays that our visibility has changed 119 hudWeaponMode->setVisible(visible); 120 120 } 121 121 } … … 154 154 void HUDWeapon::createHUDChilds() 155 155 { 156 if (weapon_ == NULL)156 if (weapon_ == nullptr) 157 157 { 158 158 return; … … 161 161 int positionIndex = 0; 162 162 163 for ( std::multimap<unsigned int, WeaponMode*>::const_iterator it = weapon_->getAllWeaponmodes().begin(); it != weapon_->getAllWeaponmodes().end(); ++it)163 for (const auto& mapEntry : weapon_->getAllWeaponmodes()) 164 164 { 165 165 HUDWeaponMode* hudWeaponMode = new HUDWeaponMode(this->getContext()); … … 167 167 hudWeaponMode->setOverlayGroup(this->getOverlayGroup()); 168 168 hudWeaponMode->setVisible(this->isVisible()); 169 hudWeaponMode->setWeaponMode( it->second);169 hudWeaponMode->setWeaponMode(mapEntry.second); 170 170 hudWeaponMode->setWeaponIndex(this->weaponIndex_); 171 171 hudWeaponMode->setAspectCorrection(false); … … 182 182 int positionIndex = 0; 183 183 184 for ( std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)185 { 186 (*it)->setPositionOffset(this->positionOffset_);187 (*it)->setWeaponModeIndex(positionIndex);188 (*it)->setWeaponIndex(this->weaponIndex_);189 (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);184 for (HUDWeaponMode* hudWeaponMode : hudWeaponModes_) 185 { 186 hudWeaponMode->setPositionOffset(this->positionOffset_); 187 hudWeaponMode->setWeaponModeIndex(positionIndex); 188 hudWeaponMode->setWeaponIndex(this->weaponIndex_); 189 hudWeaponMode->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_); 190 190 191 191 ++ positionIndex; … … 195 195 void HUDWeapon::destroyHUDChilds() 196 196 { 197 for ( std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)198 { 199 (*it)->destroy();197 for (HUDWeaponMode* hudWeaponMode : hudWeaponModes_) 198 { 199 hudWeaponMode->destroy(); 200 200 } 201 201 … … 205 205 void HUDWeapon::updateSize() 206 206 { 207 if (weapon_ != NULL)207 if (weapon_ != nullptr) 208 208 { 209 209 this->setSize(Vector2(weaponModeHUDActualSize_.x,weaponModeHUDActualSize_.y*weapon_->getAllWeaponmodes().size())); … … 214 214 void HUDWeapon::updatePosition() 215 215 { 216 if (weapon_ != NULL)216 if (weapon_ != nullptr) 217 217 { 218 218 this->setPosition(Vector2(weaponModeHUDActualSize_.x*weaponIndex_,0.0f) + this->positionOffset_);
Note: See TracChangeset
for help on using the changeset viewer.