- Timestamp:
- Dec 5, 2015, 10:47:51 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.cc
r10765 r10919 158 158 159 159 // Iterate trough all Pawns. 160 for( ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)160 for(Pawn* pawn : ObjectList<Pawn>()) 161 161 { 162 162 if(spawner == nullptr) // Stop if the PickupSpawner has been deleted (e.g. because it has run out of pickups to distribute). 163 163 break; 164 164 165 Vector3 distance = it->getWorldPosition() - this->getWorldPosition();166 PickupCarrier* carrier = static_cast<PickupCarrier*>( *it);165 Vector3 distance = pawn->getWorldPosition() - this->getWorldPosition(); 166 PickupCarrier* carrier = static_cast<PickupCarrier*>(pawn); 167 167 // If a PickupCarrier, that fits the target-range of the Pickupable spawned by this PickupSpawner, is in trigger-distance and the carrier is not blocked. 168 168 if(distance.length() < this->triggerDistance_ && carrier != nullptr && this->blocked_.find(carrier) == this->blocked_.end()) 169 169 { 170 170 if(carrier->isTarget(this->pickup_)) 171 this->trigger( *it);171 this->trigger(pawn); 172 172 } 173 173 }
Note: See TracChangeset
for help on using the changeset viewer.