Changeset 6728 for code/trunk/src/modules/pickup/PickupManager.cc

Timestamp:

Apr 15, 2010, 1:15:11 PM (14 years ago)

Author:

dafrick

Message:

No more seg faults with pickups (at least that's what I hope. )

File:

• code/trunk/src/modules/pickup/PickupManager.cc (modified) (2 diffs)

code/trunk/src/modules/pickup/PickupManager.cc

@@ -198 +198 @@
     {
         Pickupable* pickup = carrier->getPickup(index);
-        carrier->drop(pickup);
+        if(pickup != NULL)
+            carrier->drop(pickup);
     }
     
@@ -204 +205 @@
     {
         Pickupable* pickup = carrier->getPickup(index);
-        pickup->setUsed(use);
+        if(pickup != NULL)
+            pickup->setUsed(use);
     }