Changeset 6675 for code/branches/pickup4/src/modules/pickup/PickupManager.cc

Timestamp:

Apr 2, 2010, 5:35:14 PM (15 years ago)

Author:

dafrick

Message:

Lua bugs fixed.
Renamed name and description in PickupRepresentation to pickupName and pickupDescription to avoid problems.
More work on PickupInventory.

File:

• code/branches/pickup4/src/modules/pickup/PickupManager.cc (modified) (4 diffs)

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

@@ -127 +127 @@
     }
     
-    unsigned int PickupManager::getNumCarrierChildren(PickupCarrier* carrier)
+    int PickupManager::getNumCarrierChildren(PickupCarrier* carrier)
     {
         if(carrier == NULL)
@@ -134 +134 @@
     }
             
-    PickupCarrier* PickupManager::getCarrierChild(unsigned int index, PickupCarrier* carrier)
+    PickupCarrier* PickupManager::getCarrierChild(int index, PickupCarrier* carrier)
     {
+        if(carrier == NULL)
+            return NULL;
         return carrier->getCarrierChild(index);
     }
     
-    PickupRepresentation* PickupManager::getPickupRepresentation(unsigned int index, PickupCarrier* carrier)
+    const std::string& PickupManager::getCarrierName(orxonox::PickupCarrier* carrier)
+    {
+        if(carrier == NULL)
+            return BLANKSTRING;
+        return carrier->getCarrierName();
+    }
+    
+    PickupRepresentation* PickupManager::getPickupRepresentation(int index, PickupCarrier* carrier)
     {
         Pickupable* pickup = carrier->getPickup(index);
@@ -149 +158 @@
     
 
-    unsigned int PickupManager::getNumPickups(PickupCarrier* carrier)
+    int PickupManager::getNumPickups(PickupCarrier* carrier)
     {
+        if(carrier == NULL)
+            return 0;
         return carrier->getNumPickups();
     }
     
-    void PickupManager::dropPickup(unsigned int index, PickupCarrier* carrier)
+    void PickupManager::dropPickup(int index, PickupCarrier* carrier)
     {
         Pickupable* pickup = carrier->getPickup(index);
@@ -160 +171 @@
     }
     
-    void PickupManager::usePickup(unsigned int index, PickupCarrier* carrier, bool use)
+    void PickupManager::usePickup(int index, PickupCarrier* carrier, bool use)
     {
         Pickupable* pickup = carrier->getPickup(index);