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

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.h (modified) (1 diff)

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

@@ -72 +72 @@
             orxonox::PickupCarrier* getPawn(void);
             
-            unsigned int getNumCarrierChildren(orxonox::PickupCarrier* carrier);
-            orxonox::PickupCarrier* getCarrierChild(unsigned int index, orxonox::PickupCarrier* carrier);
+            int getNumCarrierChildren(orxonox::PickupCarrier* carrier);
+            orxonox::PickupCarrier* getCarrierChild(int index, orxonox::PickupCarrier* carrier);
             
-            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);
+            const std::string& getCarrierName(orxonox::PickupCarrier* carrier);
+            
+            int getNumPickups(orxonox::PickupCarrier* carrier);
+            PickupRepresentation* getPickupRepresentation(int index, orxonox::PickupCarrier* carrier);
+            void dropPickup(int index, orxonox::PickupCarrier* carrier);
+            void usePickup(int index, orxonox::PickupCarrier* carrier, bool use);
             // tolua_end