- Timestamp:
- Dec 22, 2009, 10:05:38 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/orxonox/pickup/ModifierPickup.cc
r5929 r6400 91 91 for (it = this->additiveModifiers_.begin(); it != this->additiveModifiers_.end(); it++) 92 92 { 93 pawn->getPickups().addAdditiveModifier( (*it).first, (*it).second);93 pawn->getPickups().addAdditiveModifier(it->first, it->second); 94 94 } 95 95 96 96 for (it = this->multiplicativeModifiers_.begin(); it != this->multiplicativeModifiers_.end(); it++) 97 97 { 98 pawn->getPickups().addMultiplicativeModifier( (*it).first, (*it).second);98 pawn->getPickups().addMultiplicativeModifier(it->first, it->second); 99 99 } 100 100 … … 128 128 for (it = this->additiveModifiers_.begin(); it != this->additiveModifiers_.end(); it++) 129 129 { 130 pawn->getPickups().removeAdditiveModifier( (*it).first, (*it).second);130 pawn->getPickups().removeAdditiveModifier(it->first, it->second); 131 131 } 132 132 133 133 for (it = this->multiplicativeModifiers_.begin(); it != this->multiplicativeModifiers_.end(); it++) 134 134 { 135 pawn->getPickups().removeMultiplicativeModifier( (*it).first, (*it).second);135 pawn->getPickups().removeMultiplicativeModifier(it->first, it->second); 136 136 } 137 137 … … 162 162 std::map<ModifierType::Value, float>::const_iterator it = this->additiveModifiers_.find(type); 163 163 if (it != this->additiveModifiers_.end()) 164 return (*it).second;164 return it->second; 165 165 else 166 166 return 0.0f; … … 175 175 std::map<ModifierType::Value, float>::const_iterator it = this->multiplicativeModifiers_.find(type); 176 176 if (it != this->multiplicativeModifiers_.end()) 177 return (*it).second;177 return it->second; 178 178 else 179 179 return 1.0f;
Note: See TracChangeset
for help on using the changeset viewer.