Changeset 11071 for code/trunk/src/modules/pickup/items/MunitionPickup.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/pickup/items/MunitionPickup.cc
r11052 r11071 86 86 void MunitionPickup::addMunitionContainer(MunitionContainer* munitionContainer) 87 87 { 88 OrxAssert(munitionContainer != NULL, "The munitionContainer cannot be NULL.");88 OrxAssert(munitionContainer != nullptr, "The munitionContainer cannot be nullptr."); 89 89 this->munitionContainers_.push_back(munitionContainer); 90 90 } … … 93 93 { 94 94 if(this->munitionContainers_.size() >= index) 95 return NULL;95 return nullptr; 96 96 else 97 97 return this->munitionContainers_[index]; … … 108 108 Pawn* pawn = this->carrierToPawnHelper(); 109 109 110 if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.110 if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed. 111 111 this->Pickupable::destroy(); 112 112 … … 114 114 if(this->isUsed()) 115 115 { 116 for( std::vector<MunitionContainer*>::iterator it = this->munitionContainers_.begin(); it != this->munitionContainers_.end(); ++it)116 for(MunitionContainer* container : this->munitionContainers_) 117 117 { 118 118 //Get pointer to the appropriate munition 119 SubclassIdentifier<Munition> identifier = (*it)->getMunitionType();119 SubclassIdentifier<Munition> identifier = container->getMunitionType(); 120 120 Munition* munition = pawn->getMunition(&identifier); 121 121 if (munition) 122 122 { 123 123 // Add munition and magzines 124 munition->addMunition( (*it)->getMunitionAmount());125 munition->addMagazines( (*it)->getMagazinesAmount());124 munition->addMunition(container->getMunitionAmount()); 125 munition->addMagazines(container->getMagazinesAmount()); 126 126 } 127 (*it)->destroy();127 container->destroy(); 128 128 } 129 129 // This will destroy the pickp … … 140 140 Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails. 141 141 @return 142 A pointer to the Pawn, or NULLif the conversion failed.142 A pointer to the Pawn, or nullptr if the conversion failed. 143 143 */ 144 144 Pawn* MunitionPickup::carrierToPawnHelper(void) … … 147 147 Pawn* pawn = orxonox_cast<Pawn*>(carrier); 148 148 149 if(pawn == NULL)149 if(pawn == nullptr) 150 150 { 151 151 orxout(internal_error, context::pickups) << "Invalid PickupCarrier in MunitionPickup." << endl;
Note: See TracChangeset
for help on using the changeset viewer.