Changeset 6669 for code/branches/pickup4/src/modules/pickup

Timestamp:

Apr 1, 2010, 10:21:35 AM (15 years ago)

Author:

dafrick

Message:

Committing recent changes in PickupInventory, to be able to try out some things and easily revert if they don't work out.

Location:

code/branches/pickup4/src/modules/pickup

Files:

• PickupManager.cc (modified) (1 diff)
• PickupManager.h (modified) (2 diffs)

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

@@ -129 +129 @@
     unsigned int PickupManager::getNumCarrierChildren(PickupCarrier* carrier)
     {
+        if(carrier == NULL)
+            return 0;
         return carrier->getNumCarrierChildren();
     }

code/branches/pickup4/src/modules/pickup/PickupManager.h

@@ -47 +47 @@
 { // tolua_export
 
-    //TODO: Remove after transfer to orxonox/pickup
-    class PickupCarrier; // tolua_export
-
     /**
     @brief
@@ -73 +70 @@
             
             // tolua_begin
-            PickupCarrier* getPawn(void);
+            orxonox::PickupCarrier* getPawn(void);
             
-            unsigned int getNumCarrierChildren(PickupCarrier* carrier);
-            PickupCarrier* getCarrierChild(unsigned int index, PickupCarrier* carrier);
+            unsigned int getNumCarrierChildren(orxonox::PickupCarrier* carrier);
+            orxonox::PickupCarrier* getCarrierChild(unsigned int index, orxonox::PickupCarrier* carrier);
             
-            unsigned int getNumPickups(PickupCarrier* carrier);
-            PickupRepresentation* getPickupRepresentation(unsigned int index, PickupCarrier* carrier);
-            void dropPickup(unsigned int index, PickupCarrier* carrier);
-            void usePickup(unsigned int index, PickupCarrier* carrier, bool use);
+            unsigned int getNumPickups(orxonox::PickupCarrier* carrier);
+            PickupRepresentation* getPickupRepresentation(unsigned int index, orxonox::PickupCarrier* carrier);
+            void dropPickup(unsigned int index, orxonox::PickupCarrier* carrier);
+            void usePickup(unsigned int index, orxonox::PickupCarrier* carrier, bool use);
             // tolua_end