Changeset 7150 for code/branches/presentation3/src/modules/pickup

Timestamp:

Jun 18, 2010, 8:54:01 PM (14 years ago)

Author:

dafrick

Message:

Untangled Pickupable and PickupCarrier a little bit.

Location:

code/branches/presentation3/src/modules/pickup

Files:

• PickupManager.cc (modified) (1 diff)
• PickupSpawner.cc (modified) (1 diff)
• items/MetaPickup.cc (modified) (1 diff)

code/branches/presentation3/src/modules/pickup/PickupManager.cc

@@ -212 +212 @@
         if(pickup != NULL && carrier != NULL)
         {
-            carrier->drop(pickup);
+            pickup->drop(carrier);
         }
     }

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

@@ -304 +304 @@
             if(target != NULL && pickup != NULL)
             {
-                if(target->pickup(pickup))
+                if(pickup->pickup(target))
                 {
                     this->decrementSpawnsRemaining();

code/branches/presentation3/src/modules/pickup/items/MetaPickup.cc

@@ -136 +136 @@
                         if(pickup != NULL && pickup != this)
                         {
-                            carrier->drop(pickup);
+                            pickup->drop(carrier);
                         }
                     }