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

Timestamp:

May 11, 2009, 6:03:40 PM (15 years ago)

Author:

danielh

Message:

Update

• Minor changes in BaseItem
• Updated to NotificationQueue from trunk (compile error with old)
• Added PickupInventory for GUI handling
• Added basic support for toLua++ methods

File:

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

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

@@ -38 +38 @@
 
 #include <map>
-#include <set>
+#include <deque>
 #include <string>
 
@@ -48 +48 @@
 {
     class BaseItem;
+    class EquipmentItem;
+    class PassiveItem;
     class UsableItem;
     class Pawn;
@@ -104 +106 @@
             { this->owner_ = owner; }
 
-        std::set<BaseItem*> getEquipmentItems();   //!< Get a list of equipment-type items.
-        std::set<BaseItem*> getPassiveItems();     //!< Get a list of passive items.
-        std::set<BaseItem*> getUsableItems();      //!< Get a list of usable items.
+        std::deque<EquipmentItem*> getEquipmentItems();   //!< Get a list of equipment-type items.
+        std::deque<PassiveItem*> getPassiveItems();     //!< Get a list of passive items.
+        std::deque<UsableItem*> getUsableItems();      //!< Get a list of usable items.
     private:
         Pawn* owner_;           //!< The owner of the PickupCollection.