Changeset 11679 for code/branches/Presentation_HS17/src/modules/pickup/PickupSpawner.cc

Timestamp:

Dec 16, 2017, 12:52:32 PM (8 years ago)

Author:

patricwi

Message:

merged AsteroidMining

Location:

code/branches/Presentation_HS17

Files:

• . (modified) (1 prop)
• src/modules/pickup/PickupSpawner.cc (modified) (1 diff)

code/branches/Presentation_HS17/src/modules/pickup/PickupSpawner.cc

@@ -158 +158 @@
             for(Pawn* pawn : ObjectList<Pawn>())
             {
-                if(spawner == nullptr) // Stop if the PickupSpawner has been deleted (e.g. because it has run out of pickups to distribute).
+                // Stop if the PickupSpawner has been deleted (e.g. because it has run out of pickups to distribute). 2nd condition prevents a possible error in isTarget(...) below. 
+                if(spawner == nullptr || this->pickup_ == nullptr) 
                     break;
+
+                if(!(pawn->doesAcceptPickups())){continue;} // skip those pawns, e.g. AsteroidMinables. 
 
                 Vector3 distance = pawn->getWorldPosition() - this->getWorldPosition();