Changeset 3001 for code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h

Timestamp:

May 20, 2009, 9:01:17 PM (16 years ago)

Author:

danielh

Message:

• Added helper method to HumanController to get it's ControllableEntity as a Pawn
• Removed tooltip, added default (empty) values for text and image from BaseItem
• Fixed tolua in BaseItem.h
• Added object to PickupCollection for the current UsableItem
• Moved most inventory logic from Lua to PickupInventory (still slow)

TODO

• Re-use of CEGUI item windows, destroying and creating them on each update is slow, very slow

File:

• code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h (modified) (2 diffs)

code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h

@@ -106 +106 @@
             { this->owner_ = owner; }
 
+        inline UsableItem* getCurrentUsable()
+            { return this->currentUsable_; };
+        inline void setCurrentUsable(UsableItem* usable)
+            { this->currentUsable_ = usable; }
+
         std::deque<EquipmentItem*> getEquipmentItems();   //!< Get a list of equipment-type items.
         std::deque<PassiveItem*> getPassiveItems();     //!< Get a list of passive items.
@@ -111 +116 @@
     private:
         Pawn* owner_;           //!< The owner of the PickupCollection.
+        UsableItem* currentUsable_;
 
         bool bBlockRemovals_;   //!< Whether to block direct removals through remove().